diff --git a/hawkbit-dmf-amqp/src/test/resources/application-test.properties b/hawkbit-dmf-amqp/src/test/resources/application-test.properties
index ee59db261..ee14154fa 100644
--- a/hawkbit-dmf-amqp/src/test/resources/application-test.properties
+++ b/hawkbit-dmf-amqp/src/test/resources/application-test.properties
@@ -10,34 +10,9 @@
 # RabbitMQ
 spring.rabbitmq.host=localhost
 
-# supported: H2, MYSQL
-hawkbit.server.database=H2
-
-spring.jpa.database=${hawkbit.server.database}
-
-
+spring.jpa.database=H2
 flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
 
-# effective DB setting
-spring.datasource.url=${${hawkbit.server.database}.spring.datasource.url}
-spring.datasource.driverClassName=${${hawkbit.server.database}.spring.datasource.driverClassName}
-spring.datasource.username=${${hawkbit.server.database}.spring.datasource.username}
-spring.datasource.password=${${hawkbit.server.database}.spring.datasource.password}
-
-# H2
-##;AUTOCOMMIT=ON
-H2.spring.datasource.url=jdbc:h2:mem:sp-db;DB_CLOSE_ON_EXIT=FALSE
-#H2.spring.datasource.url=jdbc:h2:./db/sp-db;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE
-H2.spring.datasource.driverClassName=org.h2.Driver
-H2.spring.datasource.username=sa
-H2.spring.datasource.password=sa
-
-# MYSQL
-MYSQL.spring.datasource.url=jdbc:mysql://localhost:3306/sp_test
-MYSQL.spring.datasource.driverClassName=org.mariadb.jdbc.Driver
-MYSQL.spring.datasource.username=root
-MYSQL.spring.datasource.password=
-
 # Default tenant configuration properties
 hawkbit.server.tenant.configuration.authentication-header-enabled.keyName=authentication.header.enabled
 hawkbit.server.tenant.configuration.authentication-header-enabled.defaultValue=false
diff --git a/hawkbit-mgmt-resource/src/test/resources/application-test.properties b/hawkbit-mgmt-resource/src/test/resources/application-test.properties
index a091717bd..ff1a58e82 100644
--- a/hawkbit-mgmt-resource/src/test/resources/application-test.properties
+++ b/hawkbit-mgmt-resource/src/test/resources/application-test.properties
@@ -11,9 +11,6 @@
 logging.level.=INFO
 logging.level.org.eclipse.persistence=ERROR
 
-# supported: H2, MYSQL
-hawkbit.server.database=H2
-
 hawkbit.server.ddi.security.authentication.header=true
 
 hawkbit.server.artifact.repo.upload.maxFileSize=5MB
@@ -22,32 +19,9 @@ hawkbit.server.security.dos.maxStatusEntriesPerAction=100
 
 hawkbit.server.security.dos.maxAttributeEntriesPerTarget=10
 
-spring.jpa.database=${hawkbit.server.database}
-#spring.jpa.show-sql=true
-
-
+spring.jpa.database=H2
 flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
 
-# effective DB setting
-spring.datasource.url=${${hawkbit.server.database}.spring.datasource.url}
-spring.datasource.driverClassName=${${hawkbit.server.database}.spring.datasource.driverClassName}
-spring.datasource.username=${${hawkbit.server.database}.spring.datasource.username}
-spring.datasource.password=${${hawkbit.server.database}.spring.datasource.password}
-
-# H2
-##;AUTOCOMMIT=ON
-H2.spring.datasource.url=jdbc:h2:mem:sp-db;DB_CLOSE_ON_EXIT=FALSE
-#H2.spring.datasource.url=jdbc:h2:./db/sp-db;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE
-H2.spring.datasource.driverClassName=org.h2.Driver
-H2.spring.datasource.username=sa
-H2.spring.datasource.password=sa
-
-# MYSQL
-MYSQL.spring.datasource.url=jdbc:mysql://localhost:3306/sp_test
-MYSQL.spring.datasource.driverClassName=org.mariadb.jdbc.Driver
-MYSQL.spring.datasource.username=root
-MYSQL.spring.datasource.password=
-
 # SP Controller configuration
 hawkbit.controller.pollingTime=00:01:00
 hawkbit.controller.pollingOverdueTime=00:01:00
diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/CIMySqlTestDatabase.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/CIMySqlTestDatabase.java
index 3601f896e..cd2054aa3 100644
--- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/CIMySqlTestDatabase.java
+++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/CIMySqlTestDatabase.java
@@ -37,12 +37,6 @@ public class CIMySqlTestDatabase implements Testdatabase {
         this.password = System.getProperty("spring.datasource.password");
         this.uri = System.getProperty("spring.datasource.url");
         createSchemaUri();
-        initSystemProperties();
-    }
-
-    private final void initSystemProperties() {
-        System.setProperty("spring.datasource.driverClassName", getDriverClassName());
-        System.setProperty("spring.jpa.database", "MYSQL");
     }
 
     private void createSchemaUri() {
@@ -85,12 +79,6 @@ public class CIMySqlTestDatabase implements Testdatabase {
         }
     }
 
-    @Override
-    public String getDriverClassName() {
-        return "org.mariadb.jdbc.Driver";
-
-    }
-
     @Override
     public String getUri() {
         return uri;
diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/Testdatabase.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/Testdatabase.java
index e6f9be49f..8a10558f3 100644
--- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/Testdatabase.java
+++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/Testdatabase.java
@@ -20,6 +20,4 @@ public interface Testdatabase {
 
     public String getUri();
 
-    String getDriverClassName();
-
 }