diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java
index d12a341a43..bb8106f11e 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java
@@ -36,7 +36,8 @@ public class ConnectionTest5 extends TestCase {
         dataSource.setMinEvictableIdleTimeMillis(300 * 1000); // 300 / 10
         dataSource.setTimeBetweenEvictionRunsMillis(180 * 1000); // 180 / 10
         dataSource.setTestWhileIdle(true);
-        dataSource.setTestOnBorrow(false);
+        dataSource.setTestOnBorrow(true);
+        dataSource.setTestOnReturn(true);
         dataSource.setValidationQuery("SELECT 1");
         dataSource.setFilters("stat,trace");
 
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java
index dc24e92db4..ea0d3c5f8c 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java
@@ -15,4 +15,12 @@ public class PoolableWrapperTest extends TestCase {
         Assert.assertEquals(true, wrapper.isWrapperFor(PoolableWrapper.class));
         Assert.assertEquals(true, wrapper.isWrapperFor(MockConnection.class));
     }
+    
+    public void test_unwrap() throws Exception {
+        PoolableWrapper wrapper = new PoolableWrapper(new MockConnection());
+        
+        Assert.assertEquals(null, wrapper.unwrap(null));
+        Assert.assertEquals(true, wrapper.unwrap(PoolableWrapper.class) != null);
+        Assert.assertEquals(true, wrapper.unwrap(MockConnection.class) != null);
+    }
 }