diff --git a/tests/tests.go b/tests/tests.go
index 3d762ad774..e3d49f9b8d 100644
--- a/tests/tests.go
+++ b/tests/tests.go
@@ -457,10 +457,6 @@ func (c *TestContext) postmortem(t *testing.T, test *Test, timestamp time.Time)
 // - execute the cleanup functions and commands
 // - replay the tests against the history with the recorded timestamps
 func RunTest(t *testing.T, test *Test) {
-	if standalone && !initStandalone {
-		runStandalone()
-	}
-
 	client, err := client.NewCrudClientFromConfig(&shttp.AuthenticationOpts{})
 	if err != nil {
 		t.Fatalf("Failed to create client: %s", err)
@@ -939,4 +935,8 @@ func init() {
 	if err := config.InitLogging(); err != nil {
 		panic(fmt.Sprintf("Failed to initialize logging system: %s", err))
 	}
+
+	if standalone && !initStandalone {
+		runStandalone()
+	}
 }