diff --git a/app/server_test.go b/app/server_test.go
index d25dbd7fa3..17c678b004 100644
--- a/app/server_test.go
+++ b/app/server_test.go
@@ -205,7 +205,12 @@ func TestStartServerTLSSuccess(t *testing.T) {
 
 func TestDatabaseTypeAndMattermostVersion(t *testing.T) {
 	sqlDrivernameEnvironment := os.Getenv("MM_SQLSETTINGS_DRIVERNAME")
-	defer os.Setenv("MM_SQLSETTINGS_DRIVERNAME", sqlDrivernameEnvironment)
+
+	if sqlDrivernameEnvironment != "" {
+		defer os.Setenv("MM_SQLSETTINGS_DRIVERNAME", sqlDrivernameEnvironment)
+	} else {
+		defer os.Unsetenv("MM_SQLSETTINGS_DRIVERNAME")
+	}
 
 	os.Setenv("MM_SQLSETTINGS_DRIVERNAME", "postgres")