diff --git a/database/pgsql/pgsql_test.go b/database/pgsql/pgsql_test.go
index 03eda8c7c2..43be4f65ac 100644
--- a/database/pgsql/pgsql_test.go
+++ b/database/pgsql/pgsql_test.go
@@ -117,10 +117,11 @@ func TestMain(m *testing.M) {
 	withFixtureName = fName
 	withoutFixtureName = nfName
 
-	m.Run()
+	rc := m.Run()
 
 	dropTemplateDatabase(fURL, fName)
 	dropTemplateDatabase(nfURL, nfName)
+	os.Exit(rc)
 }
 
 func openCopiedDatabase(testConfig database.RegistrableComponentConfig, fixture bool) (database.Datastore, error) {