diff --git a/packer_test/plugin_test.go b/packer_test/plugin_test.go
index 58d9435b2..5ba3f1e9b 100644
--- a/packer_test/plugin_test.go
+++ b/packer_test/plugin_test.go
@@ -129,10 +129,10 @@ func BuildSimplePlugin(versionString string, t *testing.T) string {
 		t.Fatalf("failed to compile plugin binary: %s", err)
 	}
 
-	miniPluginDir := filepath.Join(testDir, "mini_plugin")
+	testerPluginDir := filepath.Join(testDir, "plugin_tester")
 	outBin := filepath.Join(PluginBinaryDir(), BinaryName(v))
 
-	compileCommand := exec.Command("go", "build", "-C", miniPluginDir, "-o", outBin, "-ldflags", LDFlags(v), ".")
+	compileCommand := exec.Command("go", "build", "-C", testerPluginDir, "-o", outBin, "-ldflags", LDFlags(v), ".")
 	logs, err := compileCommand.CombinedOutput()
 	if err != nil {
 		t.Fatalf("failed to compile plugin binary: %s\ncompiler logs: %s", err, logs)
diff --git a/packer_test/mini_plugin/LICENSE b/packer_test/plugin_tester/LICENSE
similarity index 100%
rename from packer_test/mini_plugin/LICENSE
rename to packer_test/plugin_tester/LICENSE
diff --git a/packer_test/mini_plugin/README.md b/packer_test/plugin_tester/README.md
similarity index 100%
rename from packer_test/mini_plugin/README.md
rename to packer_test/plugin_tester/README.md
diff --git a/packer_test/mini_plugin/builder/dynamic/artifact.go b/packer_test/plugin_tester/builder/dynamic/artifact.go
similarity index 100%
rename from packer_test/mini_plugin/builder/dynamic/artifact.go
rename to packer_test/plugin_tester/builder/dynamic/artifact.go
diff --git a/packer_test/mini_plugin/builder/dynamic/builder.go b/packer_test/plugin_tester/builder/dynamic/builder.go
similarity index 100%
rename from packer_test/mini_plugin/builder/dynamic/builder.go
rename to packer_test/plugin_tester/builder/dynamic/builder.go
diff --git a/packer_test/mini_plugin/builder/dynamic/builder.hcl2spec.go b/packer_test/plugin_tester/builder/dynamic/builder.hcl2spec.go
similarity index 100%
rename from packer_test/mini_plugin/builder/dynamic/builder.hcl2spec.go
rename to packer_test/plugin_tester/builder/dynamic/builder.hcl2spec.go
diff --git a/packer_test/mini_plugin/builder/dynamic/builder_acc_test.go b/packer_test/plugin_tester/builder/dynamic/builder_acc_test.go
similarity index 100%
rename from packer_test/mini_plugin/builder/dynamic/builder_acc_test.go
rename to packer_test/plugin_tester/builder/dynamic/builder_acc_test.go
diff --git a/packer_test/mini_plugin/builder/dynamic/step_say_config.go b/packer_test/plugin_tester/builder/dynamic/step_say_config.go
similarity index 100%
rename from packer_test/mini_plugin/builder/dynamic/step_say_config.go
rename to packer_test/plugin_tester/builder/dynamic/step_say_config.go
diff --git a/packer_test/mini_plugin/builder/dynamic/test-fixtures/template.pkr.hcl b/packer_test/plugin_tester/builder/dynamic/test-fixtures/template.pkr.hcl
similarity index 100%
rename from packer_test/mini_plugin/builder/dynamic/test-fixtures/template.pkr.hcl
rename to packer_test/plugin_tester/builder/dynamic/test-fixtures/template.pkr.hcl
diff --git a/packer_test/mini_plugin/datasource/dynamic/data.go b/packer_test/plugin_tester/datasource/dynamic/data.go
similarity index 100%
rename from packer_test/mini_plugin/datasource/dynamic/data.go
rename to packer_test/plugin_tester/datasource/dynamic/data.go
diff --git a/packer_test/mini_plugin/datasource/dynamic/data.hcl2spec.go b/packer_test/plugin_tester/datasource/dynamic/data.hcl2spec.go
similarity index 100%
rename from packer_test/mini_plugin/datasource/dynamic/data.hcl2spec.go
rename to packer_test/plugin_tester/datasource/dynamic/data.hcl2spec.go
diff --git a/packer_test/mini_plugin/datasource/dynamic/data_acc_test.go b/packer_test/plugin_tester/datasource/dynamic/data_acc_test.go
similarity index 100%
rename from packer_test/mini_plugin/datasource/dynamic/data_acc_test.go
rename to packer_test/plugin_tester/datasource/dynamic/data_acc_test.go
diff --git a/packer_test/mini_plugin/datasource/dynamic/test-fixtures/template.pkr.hcl b/packer_test/plugin_tester/datasource/dynamic/test-fixtures/template.pkr.hcl
similarity index 100%
rename from packer_test/mini_plugin/datasource/dynamic/test-fixtures/template.pkr.hcl
rename to packer_test/plugin_tester/datasource/dynamic/test-fixtures/template.pkr.hcl
diff --git a/packer_test/mini_plugin/datasource/parrot/data.go b/packer_test/plugin_tester/datasource/parrot/data.go
similarity index 100%
rename from packer_test/mini_plugin/datasource/parrot/data.go
rename to packer_test/plugin_tester/datasource/parrot/data.go
diff --git a/packer_test/mini_plugin/datasource/parrot/data.hcl2spec.go b/packer_test/plugin_tester/datasource/parrot/data.hcl2spec.go
similarity index 100%
rename from packer_test/mini_plugin/datasource/parrot/data.hcl2spec.go
rename to packer_test/plugin_tester/datasource/parrot/data.hcl2spec.go
diff --git a/packer_test/mini_plugin/datasource/sleeper/data.go b/packer_test/plugin_tester/datasource/sleeper/data.go
similarity index 100%
rename from packer_test/mini_plugin/datasource/sleeper/data.go
rename to packer_test/plugin_tester/datasource/sleeper/data.go
diff --git a/packer_test/mini_plugin/datasource/sleeper/data.hcl2spec.go b/packer_test/plugin_tester/datasource/sleeper/data.hcl2spec.go
similarity index 100%
rename from packer_test/mini_plugin/datasource/sleeper/data.hcl2spec.go
rename to packer_test/plugin_tester/datasource/sleeper/data.hcl2spec.go
diff --git a/packer_test/mini_plugin/docs/README.md b/packer_test/plugin_tester/docs/README.md
similarity index 100%
rename from packer_test/mini_plugin/docs/README.md
rename to packer_test/plugin_tester/docs/README.md
diff --git a/packer_test/mini_plugin/docs/builders/builder-name.mdx b/packer_test/plugin_tester/docs/builders/builder-name.mdx
similarity index 100%
rename from packer_test/mini_plugin/docs/builders/builder-name.mdx
rename to packer_test/plugin_tester/docs/builders/builder-name.mdx
diff --git a/packer_test/mini_plugin/docs/datasources/datasource-name.mdx b/packer_test/plugin_tester/docs/datasources/datasource-name.mdx
similarity index 100%
rename from packer_test/mini_plugin/docs/datasources/datasource-name.mdx
rename to packer_test/plugin_tester/docs/datasources/datasource-name.mdx
diff --git a/packer_test/mini_plugin/docs/post-processors/postprocessor-name.mdx b/packer_test/plugin_tester/docs/post-processors/postprocessor-name.mdx
similarity index 100%
rename from packer_test/mini_plugin/docs/post-processors/postprocessor-name.mdx
rename to packer_test/plugin_tester/docs/post-processors/postprocessor-name.mdx
diff --git a/packer_test/mini_plugin/docs/provisioners/provisioner-name.mdx b/packer_test/plugin_tester/docs/provisioners/provisioner-name.mdx
similarity index 100%
rename from packer_test/mini_plugin/docs/provisioners/provisioner-name.mdx
rename to packer_test/plugin_tester/docs/provisioners/provisioner-name.mdx
diff --git a/packer_test/mini_plugin/example/README.md b/packer_test/plugin_tester/example/README.md
similarity index 100%
rename from packer_test/mini_plugin/example/README.md
rename to packer_test/plugin_tester/example/README.md
diff --git a/packer_test/mini_plugin/example/build.pkr.hcl b/packer_test/plugin_tester/example/build.pkr.hcl
similarity index 100%
rename from packer_test/mini_plugin/example/build.pkr.hcl
rename to packer_test/plugin_tester/example/build.pkr.hcl
diff --git a/packer_test/mini_plugin/example/data.pkr.hcl b/packer_test/plugin_tester/example/data.pkr.hcl
similarity index 100%
rename from packer_test/mini_plugin/example/data.pkr.hcl
rename to packer_test/plugin_tester/example/data.pkr.hcl
diff --git a/packer_test/mini_plugin/example/variables.pkr.hcl b/packer_test/plugin_tester/example/variables.pkr.hcl
similarity index 100%
rename from packer_test/mini_plugin/example/variables.pkr.hcl
rename to packer_test/plugin_tester/example/variables.pkr.hcl
diff --git a/packer_test/mini_plugin/go.mod b/packer_test/plugin_tester/go.mod
similarity index 100%
rename from packer_test/mini_plugin/go.mod
rename to packer_test/plugin_tester/go.mod
diff --git a/packer_test/mini_plugin/go.sum b/packer_test/plugin_tester/go.sum
similarity index 100%
rename from packer_test/mini_plugin/go.sum
rename to packer_test/plugin_tester/go.sum
diff --git a/packer_test/mini_plugin/main.go b/packer_test/plugin_tester/main.go
similarity index 100%
rename from packer_test/mini_plugin/main.go
rename to packer_test/plugin_tester/main.go
diff --git a/packer_test/mini_plugin/post-processor/dynamic/post-processor.go b/packer_test/plugin_tester/post-processor/dynamic/post-processor.go
similarity index 100%
rename from packer_test/mini_plugin/post-processor/dynamic/post-processor.go
rename to packer_test/plugin_tester/post-processor/dynamic/post-processor.go
diff --git a/packer_test/mini_plugin/post-processor/dynamic/post-processor.hcl2spec.go b/packer_test/plugin_tester/post-processor/dynamic/post-processor.hcl2spec.go
similarity index 100%
rename from packer_test/mini_plugin/post-processor/dynamic/post-processor.hcl2spec.go
rename to packer_test/plugin_tester/post-processor/dynamic/post-processor.hcl2spec.go
diff --git a/packer_test/mini_plugin/post-processor/dynamic/post-processor_acc_test.go b/packer_test/plugin_tester/post-processor/dynamic/post-processor_acc_test.go
similarity index 100%
rename from packer_test/mini_plugin/post-processor/dynamic/post-processor_acc_test.go
rename to packer_test/plugin_tester/post-processor/dynamic/post-processor_acc_test.go
diff --git a/packer_test/mini_plugin/post-processor/dynamic/test-fixtures/template.pkr.hcl b/packer_test/plugin_tester/post-processor/dynamic/test-fixtures/template.pkr.hcl
similarity index 100%
rename from packer_test/mini_plugin/post-processor/dynamic/test-fixtures/template.pkr.hcl
rename to packer_test/plugin_tester/post-processor/dynamic/test-fixtures/template.pkr.hcl
diff --git a/packer_test/mini_plugin/provisioner/dynamic/provisioner.go b/packer_test/plugin_tester/provisioner/dynamic/provisioner.go
similarity index 100%
rename from packer_test/mini_plugin/provisioner/dynamic/provisioner.go
rename to packer_test/plugin_tester/provisioner/dynamic/provisioner.go
diff --git a/packer_test/mini_plugin/provisioner/dynamic/provisioner.hcl2spec.go b/packer_test/plugin_tester/provisioner/dynamic/provisioner.hcl2spec.go
similarity index 100%
rename from packer_test/mini_plugin/provisioner/dynamic/provisioner.hcl2spec.go
rename to packer_test/plugin_tester/provisioner/dynamic/provisioner.hcl2spec.go
diff --git a/packer_test/mini_plugin/provisioner/dynamic/provisioner_acc_test.go b/packer_test/plugin_tester/provisioner/dynamic/provisioner_acc_test.go
similarity index 100%
rename from packer_test/mini_plugin/provisioner/dynamic/provisioner_acc_test.go
rename to packer_test/plugin_tester/provisioner/dynamic/provisioner_acc_test.go
diff --git a/packer_test/mini_plugin/provisioner/dynamic/test-fixtures/template.pkr.hcl b/packer_test/plugin_tester/provisioner/dynamic/test-fixtures/template.pkr.hcl
similarity index 100%
rename from packer_test/mini_plugin/provisioner/dynamic/test-fixtures/template.pkr.hcl
rename to packer_test/plugin_tester/provisioner/dynamic/test-fixtures/template.pkr.hcl
diff --git a/packer_test/mini_plugin/version/version.go b/packer_test/plugin_tester/version/version.go
similarity index 100%
rename from packer_test/mini_plugin/version/version.go
rename to packer_test/plugin_tester/version/version.go
diff --git a/packer_test/suite_test.go b/packer_test/suite_test.go
index 7e6961a7c..4fef4a459 100644
--- a/packer_test/suite_test.go
+++ b/packer_test/suite_test.go
@@ -25,8 +25,8 @@ type PackerTestSuite struct {
 func buildPluginVersion(waitgroup *sync.WaitGroup, versionString string, t *testing.T) {
 	waitgroup.Add(1)
 	go func() {
+		defer waitgroup.Done()
 		BuildSimplePlugin(versionString, t)
-		waitgroup.Done()
 	}()
 }