diff --git a/integrations/benchmarks_test.go b/integrations/benchmarks_test.go
index 4be3008f5..7c7aff994 100644
--- a/integrations/benchmarks_test.go
+++ b/integrations/benchmarks_test.go
@@ -25,7 +25,7 @@ func BenchmarkRepo(b *testing.B) {
 		{url: "https://github.com/golang/go.git", name: "go", skipShort: true},
 		{url: "https://github.com/torvalds/linux.git", name: "linux", skipShort: true},
 	}
-	prepareTestEnv(b)
+	defer prepareTestEnv(b)()
 	session := loginUser(b, "user2")
 	b.ResetTimer()
 
@@ -75,7 +75,7 @@ func StringWithCharset(length int, charset string) string {
 
 func BenchmarkRepoBranchCommit(b *testing.B) {
 	samples := []int64{1, 3, 15, 16}
-	prepareTestEnv(b)
+	defer prepareTestEnv(b)()
 	b.ResetTimer()
 
 	for _, repoID := range samples {
diff --git a/integrations/git_helper_for_declarative_test.go b/integrations/git_helper_for_declarative_test.go
index 1eb1f1dc8..b334c55d3 100644
--- a/integrations/git_helper_for_declarative_test.go
+++ b/integrations/git_helper_for_declarative_test.go
@@ -78,7 +78,7 @@ func allowLFSFilters() []string {
 
 func onGiteaRun(t *testing.T, callback func(*testing.T, *url.URL), prepare ...bool) {
 	if len(prepare) == 0 || prepare[0] {
-		prepareTestEnv(t, 1)
+		defer prepareTestEnv(t, 1)()
 	}
 	s := http.Server{
 		Handler: mac,
diff --git a/integrations/gpg_git_test.go b/integrations/gpg_git_test.go
index 6c9b7c00f..a31dec29b 100644
--- a/integrations/gpg_git_test.go
+++ b/integrations/gpg_git_test.go
@@ -23,7 +23,7 @@ import (
 )
 
 func TestGPGGit(t *testing.T) {
-	prepareTestEnv(t)
+	defer prepareTestEnv(t)()
 	username := "user2"
 
 	// OK Set a new GPG home