diff --git a/test/db.go b/test/db.go
index 9d98acdc3..35118aee1 100644
--- a/test/db.go
+++ b/test/db.go
@@ -52,10 +52,14 @@ func createRemoteDB(t *testing.T, dbName, user, connStr string) {
 	if err != nil {
 		t.Fatalf("failed to open postgres conn with connstr=%s : %s", connStr, err)
 	}
-	_, err = db.Exec(fmt.Sprintf(`CREATE DATABASE %s; GRANT ALL PRIVILEGES ON DATABASE %s TO %s`, dbName, dbName, user))
+	_, err = db.Exec(fmt.Sprintf(`CREATE DATABASE %s;`, dbName))
 	if err != nil {
 		t.Fatalf("failed to CREATE DATABASE: %s", err)
 	}
+	_, err = db.Exec(fmt.Sprintf(`GRANT ALL PRIVILEGES ON DATABASE %s TO %s`, dbName, user))
+	if err != nil {
+		t.Fatalf("failed to GRANT: %s", err)
+	}
 	_ = db.Close()
 }