diff --git a/Makefile b/Makefile
index 9f022f833b2..1057564fab1 100644
--- a/Makefile
+++ b/Makefile
@@ -315,7 +315,7 @@ test-go-integration-memcached: ## Run integration tests for memcached cache.
 test-go-integration-spanner: ## Run integration tests for Spanner backend with flags. Uses spanner-emulator on localhost:9010 and localhost:9020.
 	@if [ "${WIRE_TAGS}" != "enterprise" ]; then echo "Spanner integration test require enterprise setup"; exit 1; fi
 	@echo "test backend integration spanner tests"
-	GRAFANA_TEST_DB=spanner SPANNER_DB=emulator \
+	GRAFANA_TEST_DB=spanner \
 	$(GO) test $(GO_RACE_FLAG) $(GO_TEST_FLAGS) -p=1 -count=1 -v -run "^TestIntegration" -covermode=atomic -timeout=2m $(GO_INTEGRATION_TESTS)
 
 .PHONY: test-js
diff --git a/pkg/services/sqlstore/sqlutil/sqlutil.go b/pkg/services/sqlstore/sqlutil/sqlutil.go
index 4da6a8fddb5..d80104c55bd 100644
--- a/pkg/services/sqlstore/sqlutil/sqlutil.go
+++ b/pkg/services/sqlstore/sqlutil/sqlutil.go
@@ -161,7 +161,7 @@ func spannerTestDB() (*TestDB, error) {
 
 	spannerDB := os.Getenv("SPANNER_DB")
 	if spannerDB == "" {
-		return nil, errors.New("SPANNER_DB environment variable not set")
+		spannerDB = "emulator"
 	}
 
 	if spannerDB == "spannertest" {