diff --git a/server/daemon/daemon_test.go b/server/daemon/daemon_test.go
index f1ad44caaa23b0422c1389d4f9833d2dc80a54e7..0592db2de732c03cb048e16b5c48640dd7c2ce8b 100644
--- a/server/daemon/daemon_test.go
+++ b/server/daemon/daemon_test.go
@@ -32,13 +32,13 @@ func TestMain(m *testing.M) {
 		log.Fatal(err)
 	}
 	defer os.RemoveAll(tmp)
-	os.Setenv("SOFT_SERVE_DATA_PATH", tmp)
-	os.Setenv("SOFT_SERVE_GIT_MAX_CONNECTIONS", "3")
-	os.Setenv("SOFT_SERVE_GIT_MAX_TIMEOUT", "100")
-	os.Setenv("SOFT_SERVE_GIT_IDLE_TIMEOUT", "1")
-	os.Setenv("SOFT_SERVE_GIT_LISTEN_ADDR", fmt.Sprintf(":%d", test.RandomPort()))
 	ctx := context.TODO()
 	cfg := config.DefaultConfig()
+	cfg.DataPath = tmp
+	cfg.Git.MaxConnections = 3
+	cfg.Git.MaxTimeout = 100
+	cfg.Git.IdleTimeout = 1
+	cfg.Git.ListenAddr = fmt.Sprintf(":%d", test.RandomPort())
 	if err := cfg.Validate(); err != nil {
 		log.Fatal(err)
 	}