diff --git a/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestHBaseImportExport.groovy b/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestHBaseImportExport.groovy
index 14c20f2..1427bc4 100644
--- a/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestHBaseImportExport.groovy
+++ b/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestHBaseImportExport.groovy
@@ -95,6 +95,7 @@
     admin.deleteTable(orig)
     admin.disableTable(export)
     admin.deleteTable(export)
+    sh.exec("hadoop fs -rm -r -skipTrash 'orig_*'");
   }
 
   @Test
diff --git a/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestImportTsv.groovy b/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestImportTsv.groovy
index decd116..f94a641 100644
--- a/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestImportTsv.groovy
+++ b/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestImportTsv.groovy
@@ -92,8 +92,7 @@
     // delete data and junk from HDFS
     sh.exec("hadoop fs -rm -r -skipTrash $DATADIR1",
       "hadoop fs -rm -r -skipTrash $DATADIR2",
-      "hadoop fs -rm -r -skipTrash /user/$USER/hbase*",
-      "hadoop fs -rm -r -skipTrash /user/$USER/orig_*");
+      "hadoop fs -rm -r -skipTrash '/user/$USER/hbase*'");
     assertTrue("teardown failed", sh.getRet() == 0);
   }