diff --git a/ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java b/ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java
index 2a5ae03..3fdc440 100644
--- a/ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java
+++ b/ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java
@@ -391,10 +391,13 @@ private void testConnection() {
     } finally {
       try {
         if (conn != null) {
-          if (!conn.getAutoCommit()) {
-            conn.rollback();
+          try {
+            if (!conn.getAutoCommit()) {
+              conn.rollback();
+            }
+          } finally {
+            conn.closePooledConnection(false);
           }
-          conn.closePooledConnection(false);
         }
       } catch (SQLException ex) {
         Log.warn("Can't close connection in checkDataSource!");