diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java
index 7e03b880cc..383b6b474c 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java
@@ -13,9 +13,15 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class Case0 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
+    protected void tearDown() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
 
     public void test_0() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
         
         final DruidDataSource dataSource = new DruidDataSource();
 
@@ -60,6 +66,5 @@ public class Case0 extends TestCase {
         Assert.assertTrue(completeLatch.await(1, TimeUnit.SECONDS));
 
         dataSource.close();
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
 }
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java
index 3912652cdb..38625f049b 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java
@@ -12,8 +12,12 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 public class Case1 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     protected void tearDown() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
     }
     
     public void test_f() throws Exception {
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java
index 3c260d2d3f..e8caa54a07 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java
@@ -31,8 +31,12 @@ import com.alibaba.druid.util.JMXUtils;
  * @author admin 2011-5-4 下午02:45:21
  */
 public class Case2 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     protected void tearDown() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
     }
     
     public void test_singleThread() throws Exception {
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java
index 4646dea927..4b96a88b1a 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java
@@ -40,9 +40,12 @@ public class Case3 extends TestCase {
     //
     // dataSource.close();
     // }
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
     
     protected void tearDown() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
     }
 
     public void test_2() throws Exception {
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java
index 58587d2aa5..f60de20466 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java
@@ -10,8 +10,12 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager;
 import com.alibaba.druid.stat.JdbcStatManager;
 
 public class DruidDataSourceFilterTest extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     protected void tearDown() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
     }
     
     public void test_filter() throws Exception {
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java
index 4f7dfea190..c9597ca256 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java
@@ -16,6 +16,8 @@ public class ManagedDataSourceTest extends TestCase {
     private DruidDataSource dataSource;
 
     public void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         dataSource = new DruidDataSource();
         dataSource.setUrl("jdbc:mock:xxx");
     }
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java
index 7b960a89f5..d7ac66704b 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java
@@ -10,6 +10,10 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager;
 import com.alibaba.druid.stat.JdbcStatManager;
 
 public class ParamTest extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java
index b434e0cfaf..96ceffb4bd 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java
@@ -9,9 +9,17 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class PasswordCallbackTest extends TestCase {
-
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
+    protected void tearDown() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     public void test_0() throws Exception {
         DruidDataSource dataSource = new DruidDataSource();
         dataSource.setUrl("jdbc:mock:");
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SpringFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SpringFilterTest.java
index 4eebe665c8..cfd4f1d691 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/SpringFilterTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/SpringFilterTest.java
@@ -18,7 +18,14 @@ import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class SpringFilterTest extends TestCase {
-
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
+    protected void tearDown() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     public void test_spring() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
         
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java
index 3d75c48cad..e4858ba9dd 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java
@@ -13,6 +13,8 @@ public class TestAbondon extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         dataSource = new DruidDataSource();
         dataSource.setRemoveAbandoned(true);
         dataSource.setRemoveAbandonedTimeoutMillis(10);
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java
index 6e007dd29b..dec8a22aab 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java
@@ -11,6 +11,10 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestClose_0 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java
index 7dd55bd074..ed24317737 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java
@@ -8,9 +8,17 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestClose_1 extends TestCase {
-
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
+    protected void tearDown() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     public void test_close() throws Exception {
         DruidDataSource dataSource = new DruidDataSource();
         dataSource.setPoolPreparedStatements(true);
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java
index 3a71f3f213..1ac01a6b7c 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java
@@ -17,6 +17,8 @@ public class TestDisable extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         driver = new MockDriver();
 
         dataSource = new DruidDataSource();
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java
index 8040c260f7..ecbc69bdc9 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java
@@ -29,6 +29,10 @@ public class TestDruidDataSource extends TestCase {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
     
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     public void test_0() throws Exception {
         DruidDataSource dataSource = new DruidDataSource();
 
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java
index f1cfc4bdd6..792e07f043 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java
@@ -17,6 +17,8 @@ public class TestGraceShutdown extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         driver = new MockDriver();
 
         dataSource = new DruidDataSource();
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java
index 5ce8d1d8c3..a79a337521 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java
@@ -14,6 +14,10 @@ public class TestIdle extends TestCase {
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
+    
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
 
     public void test_idle() throws Exception {
         MockDriver driver = new MockDriver();
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java
index 51c29af9a6..f0befe68f5 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java
@@ -11,6 +11,10 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestIdle2 extends TestCase {
 
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java
index c2bb22d255..01dd27afcb 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java
@@ -13,6 +13,10 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestIdle3 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java
index d9d4d97cb9..e624240ea0 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java
@@ -13,6 +13,10 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestIdle3_Concurrent extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java
index c98addccaf..975264a66c 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java
@@ -20,6 +20,8 @@ public class TestIdle3_Concurrent_Starvation extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         driver = new MockDriver();
 
         dataSource = new DruidDataSource();
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java
index bbf31d13e4..150f676672 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java
@@ -17,6 +17,8 @@ public class TestPoolPreparedStatement extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         driver = new MockDriver();
 
         dataSource = new DruidDataSource();