diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java
index c4b4fae0ed..e5929b80c7 100644
--- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java
+++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java
@@ -19,6 +19,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
+import com.alibaba.druid.PoolTestCase;
 import org.junit.Assert;
 import junit.framework.TestCase;
 
@@ -28,13 +29,15 @@ import com.alibaba.druid.mock.MockStatement;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
-public class Bug_for_happyday517 extends TestCase {
+public class Bug_for_happyday517 extends PoolTestCase {
 
     private DruidDataSource dataSource;
     private MockDriver      driver;
     private int originalDataSourceCount = 0;
 
     protected void setUp() throws Exception {
+        super.setUp();
+
         originalDataSourceCount = DruidDataSourceStatManager.getInstance().getDataSourceList().size();
         
         driver = new MockDriver();
@@ -47,6 +50,8 @@ public class Bug_for_happyday517 extends TestCase {
     protected void tearDown() throws Exception {
         dataSource.close();
         Assert.assertEquals(originalDataSourceCount, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+
+        super.tearDown();
     }
 
     public void test_for_happyday517_0() throws Exception {
diff --git a/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java
index a70688a985..895c72500a 100644
--- a/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java
@@ -1,5 +1,6 @@
 package com.alibaba.druid.bvt.filter;
 
+import com.alibaba.druid.PoolTestCase;
 import junit.framework.TestCase;
 
 import org.junit.Assert;
@@ -9,7 +10,7 @@ import com.alibaba.druid.filter.stat.StatFilter;
 import com.alibaba.druid.pool.DruidDataSource;
 
 
-public class ClearFilterTest extends TestCase {
+public class ClearFilterTest extends PoolTestCase {
     public void test_filters() throws Exception {
         DruidDataSource dataSource = new DruidDataSource();
         Assert.assertEquals(0, dataSource.getProxyFilters().size());
diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java
index 1ddca95857..ba055c5fba 100644
--- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java
@@ -19,6 +19,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 
+import com.alibaba.druid.PoolTestCase;
 import org.junit.Assert;
 import junit.framework.TestCase;
 
@@ -26,7 +27,7 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.JdbcSqlStat;
 import com.alibaba.druid.util.JdbcUtils;
 
-public class StatFilterResultSetMultiCloseTest extends TestCase {
+public class StatFilterResultSetMultiCloseTest extends PoolTestCase {
 
     private DruidDataSource dataSource;
 
diff --git a/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java b/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java
index 56da33e508..7ae291a762 100644
--- a/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java
@@ -21,11 +21,12 @@ import java.sql.ResultSet;
 import java.sql.Statement;
 import java.sql.Timestamp;
 
+import com.alibaba.druid.PoolTestCase;
 import junit.framework.TestCase;
 
 import org.junit.Assert;
 
-public class MockExecuteTest extends TestCase {
+public class MockExecuteTest extends PoolTestCase {
 
     public void test_0() throws Exception {
         Connection conn = DriverManager.getConnection("jdbc:mock:");