diff --git a/co.codewizards.cloudstore.local/src/test/java/co/codewizards/cloudstore/local/db/PostgresqlDatabaseAdapterTest.java b/co.codewizards.cloudstore.local/src/test/java/co/codewizards/cloudstore/local/db/PostgresqlDatabaseAdapterTest.java
index aa2930c1..bd3fc8bb 100644
--- a/co.codewizards.cloudstore.local/src/test/java/co/codewizards/cloudstore/local/db/PostgresqlDatabaseAdapterTest.java
+++ b/co.codewizards.cloudstore.local/src/test/java/co/codewizards/cloudstore/local/db/PostgresqlDatabaseAdapterTest.java
@@ -26,6 +26,7 @@ public static void before_PostgresqlDatabaseAdapterTest() {
 
 		System.setProperty(Config.SYSTEM_PROPERTY_PREFIX + CONFIG_KEY_JDBC_DB_NAME_PREFIX, "TEST_");
 		System.setProperty(Config.SYSTEM_PROPERTY_PREFIX + CONFIG_KEY_JDBC_DB_NAME_SUFFIX, "_TEST");
+		DatabaseAdapterFactoryRegistry.getInstance().clearCache();
 	}
 
 	@AfterClass
@@ -38,6 +39,7 @@ public static void after_PostgresqlDatabaseAdapterTest() {
 
 		System.clearProperty(Config.SYSTEM_PROPERTY_PREFIX + CONFIG_KEY_JDBC_DB_NAME_PREFIX);
 		System.clearProperty(Config.SYSTEM_PROPERTY_PREFIX + CONFIG_KEY_JDBC_DB_NAME_SUFFIX);
+		DatabaseAdapterFactoryRegistry.getInstance().clearCache();
 	}
 
 	protected static String getEnvOrFail(String key) {