diff --git a/bin/iqmgr.py b/bin/iqmgr.py
index 19ba84a..ba5bf3b 100755
--- a/bin/iqmgr.py
+++ b/bin/iqmgr.py
@@ -20,10 +20,10 @@ if sys.argv[1].startswith("st"):
   print " masterq  : %d" % mq.qsize()
   print " slavesq  : %d" % sq.qsize()
 
-if sys.argv[1] == 'teardown':
+if sys.argv[1] == 'slay':
   for i in xrange(mq.qsize()):
     print i, "killing", mq.get()
-    sq.put("teardown")
+    sq.put("slay")
 
 if sys.argv[1] == 'clear':
   for i in xrange(tq.qsize()): print tq.get()
diff --git a/bin/slave.py b/bin/slave.py
index 182823f..0496e88 100644
--- a/bin/slave.py
+++ b/bin/slave.py
@@ -55,13 +55,17 @@ if __name__ == '__main__':
   if options.verbose:
     print myname
 
-  
+
   while True:
     # indicate that I am loaded up, and ready for workload
     masterq.put(myname)
     # wait for master's start signal
     action = slavesq.get()
     if action == "teardown":
+      # I take it back; I'm not ready!
+      masterq.get()
+      break
+    elif action == "slay":
       break
 
     while not tasksq.empty():