diff --git a/org.adempiere.base/src/org/compiere/db/AdempiereDatabase.java b/org.adempiere.base/src/org/compiere/db/AdempiereDatabase.java
index be6cc13a4f..0451e77f6b 100644
--- a/org.adempiere.base/src/org/compiere/db/AdempiereDatabase.java
+++ b/org.adempiere.base/src/org/compiere/db/AdempiereDatabase.java
@@ -305,7 +305,7 @@ public interface AdempiereDatabase
 	/**
 	 * Default sql use to test whether a connection is still valid
 	 */
-	public final static String DEFAULT_CONN_TEST_SQL = "SELECT Version FROM AD_System";
+	//public final static String DEFAULT_CONN_TEST_SQL = "SELECT Version FROM AD_System";
 
 	/**
 	 * Is the database have sql extension that return a subset of the query result
diff --git a/org.compiere.db.oracle.provider/META-INF/pool/client.default.properties b/org.compiere.db.oracle.provider/META-INF/pool/client.default.properties
index 7f5d8441d8..cd1da0c4ea 100644
--- a/org.compiere.db.oracle.provider/META-INF/pool/client.default.properties
+++ b/org.compiere.db.oracle.provider/META-INF/pool/client.default.properties
@@ -12,5 +12,5 @@ MinPoolSize=1
 
 #flag
 TestConnectionOnCheckin=false
-TestConnectionOnCheckout=false
+TestConnectionOnCheckout=true
 #CheckoutTimeout=60;
diff --git a/org.compiere.db.oracle.provider/META-INF/pool/server.default.properties b/org.compiere.db.oracle.provider/META-INF/pool/server.default.properties
index 06fe7041ee..759bb56dfe 100644
--- a/org.compiere.db.oracle.provider/META-INF/pool/server.default.properties
+++ b/org.compiere.db.oracle.provider/META-INF/pool/server.default.properties
@@ -13,6 +13,6 @@ MaxStatementsPerConnection=30
 
 #flag
 TestConnectionOnCheckin=false
-TestConnectionOnCheckout=false
+TestConnectionOnCheckout=true
 #CheckoutTimeout=60;
 com.mchange.v2.log.MLog=com.mchange.v2.log.slf4j.Slf4jMLog
\ No newline at end of file
diff --git a/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java b/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
index 7c42802992..2cdf30439a 100644
--- a/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
+++ b/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
@@ -664,7 +664,7 @@ public class DB_Oracle implements AdempiereDatabase
 		int maxIdleTime = getIntProperty(poolProperties, "MaxIdleTime", 1200);
 		int unreturnedConnectionTimeout = getIntProperty(poolProperties, "UnreturnedConnectionTimeout", 0);
 		boolean testConnectionOnCheckin = getBooleanProperty(poolProperties, "TestConnectionOnCheckin", false);
-		boolean testConnectionOnCheckout = getBooleanProperty(poolProperties, "TestConnectionOnCheckout", false);
+		boolean testConnectionOnCheckout = getBooleanProperty(poolProperties, "TestConnectionOnCheckout", true);
 		String mlogClass = getStringProperty(poolProperties, "com.mchange.v2.log.MLog", "com.mchange.v2.log.FallbackMLog");
 		int checkoutTimeout = getIntProperty(poolProperties, "CheckoutTimeout", 0);
 		int statementCacheNumDeferredCloseThreads = getIntProperty(poolProperties, "StatementCacheNumDeferredCloseThreads", 0);
@@ -679,7 +679,7 @@ public class DB_Oracle implements AdempiereDatabase
             cpds.setJdbcUrl(getConnectionURL(connection));
             cpds.setUser(connection.getDbUid());
             cpds.setPassword(connection.getDbPwd());
-            cpds.setPreferredTestQuery(DEFAULT_CONN_TEST_SQL);
+            //cpds.setPreferredTestQuery(DEFAULT_CONN_TEST_SQL);
             cpds.setIdleConnectionTestPeriod(idleConnectionTestPeriod);
             cpds.setAcquireRetryAttempts(acquireRetryAttempts);
             cpds.setTestConnectionOnCheckin(testConnectionOnCheckin);
diff --git a/org.compiere.db.postgresql.provider/META-INF/pool/client.default.properties b/org.compiere.db.postgresql.provider/META-INF/pool/client.default.properties
index 7f5d8441d8..cd1da0c4ea 100644
--- a/org.compiere.db.postgresql.provider/META-INF/pool/client.default.properties
+++ b/org.compiere.db.postgresql.provider/META-INF/pool/client.default.properties
@@ -12,5 +12,5 @@ MinPoolSize=1
 
 #flag
 TestConnectionOnCheckin=false
-TestConnectionOnCheckout=false
+TestConnectionOnCheckout=true
 #CheckoutTimeout=60;
diff --git a/org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties b/org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties
index eedc484d31..3e55b96ce1 100644
--- a/org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties
+++ b/org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties
@@ -14,6 +14,6 @@ MaxStatementsPerConnection=30
 
 #flag
 TestConnectionOnCheckin=false
-TestConnectionOnCheckout=false
+TestConnectionOnCheckout=true
 #CheckoutTimeout=60;
 com.mchange.v2.log.MLog=com.mchange.v2.log.slf4j.Slf4jMLog
\ No newline at end of file
diff --git a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
index 30db4bfec3..a9f0f15f40 100755
--- a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
+++ b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
@@ -756,7 +756,7 @@ public class DB_PostgreSQL implements AdempiereDatabase
 		int maxIdleTime = getIntProperty(poolProperties, "MaxIdleTime", 1200);
 		int unreturnedConnectionTimeout = getIntProperty(poolProperties, "UnreturnedConnectionTimeout", 0);
 		boolean testConnectionOnCheckin = getBooleanProperty(poolProperties, "TestConnectionOnCheckin", false);
-		boolean testConnectionOnCheckout = getBooleanProperty(poolProperties, "TestConnectionOnCheckout", false);
+		boolean testConnectionOnCheckout = getBooleanProperty(poolProperties, "TestConnectionOnCheckout", true);
 		String mlogClass = getStringProperty(poolProperties, "com.mchange.v2.log.MLog", "com.mchange.v2.log.FallbackMLog");
 		
 		int checkoutTimeout = getIntProperty(poolProperties, "CheckoutTimeout", 0);
@@ -772,7 +772,7 @@ public class DB_PostgreSQL implements AdempiereDatabase
             cpds.setJdbcUrl(getConnectionURL(connection));
             cpds.setUser(connection.getDbUid());
             cpds.setPassword(connection.getDbPwd());
-            cpds.setPreferredTestQuery(DEFAULT_CONN_TEST_SQL);
+            //cpds.setPreferredTestQuery(DEFAULT_CONN_TEST_SQL);
             cpds.setIdleConnectionTestPeriod(idleConnectionTestPeriod);
             cpds.setMaxIdleTimeExcessConnections(maxIdleTimeExcessConnections);
             cpds.setMaxIdleTime(maxIdleTime);