diff --git a/server/src/main/resources/application-mysql.properties b/server/src/main/resources/application-mysql.properties
index c72823497ec..38e1a69c34b 100644
--- a/server/src/main/resources/application-mysql.properties
+++ b/server/src/main/resources/application-mysql.properties
@@ -1,9 +1,2 @@
-# These used to be in env.xml ; they look like test properties
-database.driverClassName=org.mariadb.jdbc.Driver
-database.username=root
-database.password=changeme
-database.maxParameters=-1
-database.useSkipLocked=false
-# mysql defaults to true
-database.caseinsensitive=true
-database.default-url=jdbc:mysql://127.0.0.1:3306/uaa?useSSL=true&trustServerCertificate=true
\ No newline at end of file
+# This file is required by: org.cloudfoundry.identity.uaa.db.beans.DatabaseConfiguration
+database.driverClassName=org.mariadb.jdbc.Driver
\ No newline at end of file
diff --git a/server/src/main/resources/application-postgresql.properties b/server/src/main/resources/application-postgresql.properties
index d9b4140f452..88e94ae3c8d 100644
--- a/server/src/main/resources/application-postgresql.properties
+++ b/server/src/main/resources/application-postgresql.properties
@@ -1,8 +1,2 @@
-# These used to be in env.xml ; they look like test properties
-database.driverClassName=org.postgresql.Driver
-database.username=root
-database.password=changeme
-database.maxParameters=32767
-database.useSkipLocked=true
-database.caseinsensitive=false
-database.default-url=jdbc:postgresql:uaa
\ No newline at end of file
+# This file is required by : org.cloudfoundry.identity.uaa.db.beans.DatabaseConfiguration
+database.driverClassName=org.postgresql.Driver
\ No newline at end of file
diff --git a/server/src/test/resources/application-mysql.properties b/server/src/test/resources/application-mysql.properties
new file mode 100644
index 00000000000..c72823497ec
--- /dev/null
+++ b/server/src/test/resources/application-mysql.properties
@@ -0,0 +1,9 @@
+# These used to be in env.xml ; they look like test properties
+database.driverClassName=org.mariadb.jdbc.Driver
+database.username=root
+database.password=changeme
+database.maxParameters=-1
+database.useSkipLocked=false
+# mysql defaults to true
+database.caseinsensitive=true
+database.default-url=jdbc:mysql://127.0.0.1:3306/uaa?useSSL=true&trustServerCertificate=true
\ No newline at end of file
diff --git a/server/src/test/resources/application-postgresql.properties b/server/src/test/resources/application-postgresql.properties
new file mode 100644
index 00000000000..d9b4140f452
--- /dev/null
+++ b/server/src/test/resources/application-postgresql.properties
@@ -0,0 +1,8 @@
+# These used to be in env.xml ; they look like test properties
+database.driverClassName=org.postgresql.Driver
+database.username=root
+database.password=changeme
+database.maxParameters=32767
+database.useSkipLocked=true
+database.caseinsensitive=false
+database.default-url=jdbc:postgresql:uaa
\ No newline at end of file
diff --git a/uaa/src/test/resources/application-mysql.properties b/uaa/src/test/resources/application-mysql.properties
new file mode 100644
index 00000000000..c72823497ec
--- /dev/null
+++ b/uaa/src/test/resources/application-mysql.properties
@@ -0,0 +1,9 @@
+# These used to be in env.xml ; they look like test properties
+database.driverClassName=org.mariadb.jdbc.Driver
+database.username=root
+database.password=changeme
+database.maxParameters=-1
+database.useSkipLocked=false
+# mysql defaults to true
+database.caseinsensitive=true
+database.default-url=jdbc:mysql://127.0.0.1:3306/uaa?useSSL=true&trustServerCertificate=true
\ No newline at end of file
diff --git a/uaa/src/test/resources/application-postgresql.properties b/uaa/src/test/resources/application-postgresql.properties
new file mode 100644
index 00000000000..d9b4140f452
--- /dev/null
+++ b/uaa/src/test/resources/application-postgresql.properties
@@ -0,0 +1,8 @@
+# These used to be in env.xml ; they look like test properties
+database.driverClassName=org.postgresql.Driver
+database.username=root
+database.password=changeme
+database.maxParameters=32767
+database.useSkipLocked=true
+database.caseinsensitive=false
+database.default-url=jdbc:postgresql:uaa
\ No newline at end of file