diff --git a/build/testdata/bundles/mysql/.gitignore b/build/testdata/bundles/mysql/.gitignore
index e69de29bb2..aba337c08e 100644
--- a/build/testdata/bundles/mysql/.gitignore
+++ b/build/testdata/bundles/mysql/.gitignore
@@ -0,0 +1,2 @@
+Dockerfile
+.cnab
\ No newline at end of file
diff --git a/build/testdata/bundles/wordpress/.gitignore b/build/testdata/bundles/wordpress/.gitignore
index e69de29bb2..ea5d8c03ab 100644
--- a/build/testdata/bundles/wordpress/.gitignore
+++ b/build/testdata/bundles/wordpress/.gitignore
@@ -0,0 +1,2 @@
+Dockerfile
+.cnab
diff --git a/build/testdata/bundles/wordpressv2/.gitignore b/build/testdata/bundles/wordpressv2/.gitignore
index e69de29bb2..aba337c08e 100644
--- a/build/testdata/bundles/wordpressv2/.gitignore
+++ b/build/testdata/bundles/wordpressv2/.gitignore
@@ -0,0 +1,2 @@
+Dockerfile
+.cnab
\ No newline at end of file
diff --git a/cmd/porter/completion_test.go b/cmd/porter/completion_test.go
index 276b02246a..0a44b5a2a0 100644
--- a/cmd/porter/completion_test.go
+++ b/cmd/porter/completion_test.go
@@ -28,6 +28,7 @@ func TestCompletion(t *testing.T) {
 
 func TestCompletion_SkipConfig(t *testing.T) {
 	p := porter.NewTestPorter(t)
+	defer p.Close()
 	cmd := buildCompletionCommand(p.Porter)
 	shouldSkip := shouldSkipConfig(cmd)
 	require.True(t, shouldSkip, "expected that we skip loading configuration for the completion command")
diff --git a/pkg/grpc/portergrpc/installation_test.go b/pkg/grpc/portergrpc/installation_test.go
index 3d257a028b..2158fcd2a2 100644
--- a/pkg/grpc/portergrpc/installation_test.go
+++ b/pkg/grpc/portergrpc/installation_test.go
@@ -106,6 +106,7 @@ func TestListInstallationsReturnsErrorIfUnableToGetPorterConnectionFromRequestCo
 
 func setupTestPorterWithInstallations(t *testing.T, installations []instInfo) (context.Context, map[string]porter.DisplayInstallation) {
 	p := porter.NewTestPorter(t)
+	defer p.Close()
 	insts := map[string]porter.DisplayInstallation{}
 	for _, inst := range installations {
 		installation := storage.NewInstallation(inst.namespace, inst.name)
diff --git a/tests/integration/dependenciesv2_test.go b/tests/integration/dependenciesv2_test.go
index 328dcb4e8a..a029ced307 100644
--- a/tests/integration/dependenciesv2_test.go
+++ b/tests/integration/dependenciesv2_test.go
@@ -20,6 +20,7 @@ func TestSharedDependencies(t *testing.T) {
 	t.Parallel()
 
 	p := porter.NewTestPorter(t)
+	defer p.Close()
 	ctx := p.SetupIntegrationTest()
 
 	p.Config.SetExperimentalFlags(experimental.FlagDependenciesV2)