diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
index 908cc098c..4bb4ec755 100644
--- a/acceptance/acceptance_test.go
+++ b/acceptance/acceptance_test.go
@@ -211,6 +211,8 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
 	// specifies a custom server stubs.
 	if len(config.Server) > 0 {
 		server := testserver.New(t)
+		t.Cleanup(server.Close)
+
 		for _, stub := range config.Server {
 			require.NotEmpty(t, stub.Pattern)
 			require.NotEmpty(t, stub.Response.Body)
@@ -220,9 +222,6 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
 			})
 		}
 		cmdEnv = setEnv(cmdEnv, "DATABRICKS_HOST", server.URL)
-		t.Cleanup(func() {
-			server.Close()
-		})
 	}
 
 	repls.SetPathWithParents(tmpDir, "$TMPDIR")