Index: system_test/utils/kafka_system_test_utils.py
===================================================================
--- system_test/utils/kafka_system_test_utils.py	(revision 1390005)
+++ system_test/utils/kafka_system_test_utils.py	(working copy)
@@ -824,7 +824,7 @@
             logger.info("skipping role [" + role + "] on host : [" + hostname + "]", extra=d)
             continue
 
-        cmdStr  = "ssh " + hostname + " 'rm -r " + dataDir + "/*'"
+        cmdStr  = "ssh " + hostname + " 'rm -rf " + dataDir + "'"
 
         if not dataDir.startswith("/tmp"):
             logger.warn("possible destructive command [" + cmdStr + "]", extra=d)
Index: system_test/utils/system_test_utils.py
===================================================================
--- system_test/utils/system_test_utils.py	(revision 1390005)
+++ system_test/utils/system_test_utils.py	(working copy)
@@ -387,7 +387,7 @@
         logger.info("executing command [" + cmdStr + "]", extra=d)
         system_test_utils.sys_call(cmdStr)
 
-        cmdStr  = "ssh " + hostname + " 'rm -r " + kafkaHome + "'"
+        cmdStr  = "ssh " + hostname + " 'rm -rf " + kafkaHome + "'"
         logger.info("executing command [" + cmdStr + "]", extra=d)
         #system_test_utils.sys_call(cmdStr)
     else: