diff --git a/asynchbase/src/test/java/site/ycsb/db/AsyncHBaseTest.java b/asynchbase/src/test/java/site/ycsb/db/AsyncHBaseTest.java
index 8690515916..ccc3001849 100644
--- a/asynchbase/src/test/java/site/ycsb/db/AsyncHBaseTest.java
+++ b/asynchbase/src/test/java/site/ycsb/db/AsyncHBaseTest.java
@@ -121,6 +121,7 @@ public void setUp() throws Exception {
   public void tearDown() throws Exception {
     table.close();
     testingUtil.deleteTable(tableName);
+    client.cleanup(); 
   }
 
   @Test
diff --git a/hbase1/src/test/java/site/ycsb/db/hbase1/HBaseClient1Test.java b/hbase1/src/test/java/site/ycsb/db/hbase1/HBaseClient1Test.java
index f410ba04cc..ade9d08585 100644
--- a/hbase1/src/test/java/site/ycsb/db/hbase1/HBaseClient1Test.java
+++ b/hbase1/src/test/java/site/ycsb/db/hbase1/HBaseClient1Test.java
@@ -120,6 +120,7 @@ public void setUp() throws Exception {
   public void tearDown() throws Exception {
     table.close();
     testingUtil.deleteTable(tableName);
+    client.cleanup();
   }
 
   @Test
diff --git a/hbase2/src/test/java/site/ycsb/db/hbase2/HBaseClient2Test.java b/hbase2/src/test/java/site/ycsb/db/hbase2/HBaseClient2Test.java
index 5d1cbaa41a..cd678e3fb1 100644
--- a/hbase2/src/test/java/site/ycsb/db/hbase2/HBaseClient2Test.java
+++ b/hbase2/src/test/java/site/ycsb/db/hbase2/HBaseClient2Test.java
@@ -123,6 +123,7 @@ public void setUp(Properties p) throws Exception {
   public void tearDown() throws Exception {
     table.close();
     testingUtil.deleteTable(TableName.valueOf(tableName));
+    client.cleanup();
   }
 
   @Test