diff --git a/mysql/_dumps/Makefile b/mysql/_dumps/Makefile
index fb1b4e28247a353505402c796fec0018420ad638..e4d3c10ca13f45e6aa7e57670e1228f712159b17 100644
--- a/mysql/_dumps/Makefile
+++ b/mysql/_dumps/Makefile
@@ -1,4 +1,9 @@
-TEST_HOST ?= 127.0.0.1
+TEST_HOST   ?= 127.0.0.1
+TEST_PORT   ?= 3306
 
-all:
-	cat structs.sql | mysql -uupperio -pupperio upperio_tests -h$(TEST_HOST)
+DB_USERNAME ?= upperio_tests
+DB_PASSWORD ?= upperio_secret
+DB_NAME     ?= upperio_tests
+
+load:
+	cat structs.sql | mysql -u"$(DB_USERNAME)" -p"$(DB_PASSWORD)" "$(DB_NAME)" -h"$(TEST_HOST)" -p$(TEST_PORT)
diff --git a/postgresql/_dumps/Makefile b/postgresql/_dumps/Makefile
index 83de0013912ec7f3ef76d69fd8bb4fd45f5b5a54..73176203e9fc49f610fec31b5916edf2608ff6c8 100644
--- a/postgresql/_dumps/Makefile
+++ b/postgresql/_dumps/Makefile
@@ -1,4 +1,9 @@
-TEST_HOST ?= 127.0.0.1
+TEST_HOST   ?= 127.0.0.1
+TEST_PORT   ?= 5432
 
-all:
-	cat structs.sql | PGPASSWORD="upperio" psql -Uupperio upperio_tests -h$(TEST_HOST)
+DB_USERNAME ?= upperio_tests
+DB_PASSWORD ?= upperio_secret
+DB_NAME     ?= upperio_tests
+
+load:
+	cat structs.sql | PGPASSWORD="$(DB_PASSWORD)" psql -U$(DB_USERNAME) $(DB_NAME) -h$(TEST_HOST) -p$(TEST_PORT)
diff --git a/postgresql/database_test.go b/postgresql/database_test.go
index 1dc7c3ca48bf8f22d30f55400b7ff81c8016be0d..8cf79bd54cca5c90e4ae5676c1cf5db73e3f8285 100644
--- a/postgresql/database_test.go
+++ b/postgresql/database_test.go
@@ -41,8 +41,8 @@ import (
 
 const (
 	databaseName = "upperio_tests"
-	username     = "upperio"
-	password     = "upperio"
+	username     = "upperio_tests"
+	password     = "upperio_secret"
 )
 
 const (