diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go
index 522a638..76067d9 100644
--- a/cmd/age/age_test.go
+++ b/cmd/age/age_test.go
@@ -59,7 +59,7 @@ var buildExtraCommands = sync.OnceValue(func() error {
 		cmd.Args = append(cmd.Args, "-cover")
 	}
 	cmd.Args = append(cmd.Args, "filippo.io/age/cmd/age-keygen")
-	cmd.Args = append(cmd.Args, "filippo.io/age/cmd/age-plugin-pq")
+	cmd.Args = append(cmd.Args, "filippo.io/age/extra/age-plugin-pq")
 	cmd.Args = append(cmd.Args, "filippo.io/age/cmd/age-plugin-batchpass")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
diff --git a/cmd/age-plugin-pq/plugin-pq.go b/extra/age-plugin-pq/plugin-pq.go
similarity index 100%
rename from cmd/age-plugin-pq/plugin-pq.go
rename to extra/age-plugin-pq/plugin-pq.go
diff --git a/cmd/age-plugin-tag/plugin-tag.go b/extra/age-plugin-tag/plugin-tag.go
similarity index 100%
rename from cmd/age-plugin-tag/plugin-tag.go
rename to extra/age-plugin-tag/plugin-tag.go
diff --git a/cmd/age-plugin-tagpq/plugin-tagpq.go b/extra/age-plugin-tagpq/plugin-tagpq.go
similarity index 100%
rename from cmd/age-plugin-tagpq/plugin-tagpq.go
rename to extra/age-plugin-tagpq/plugin-tagpq.go