diff --git a/cleanup-user.sh b/cleanup-user.sh
index d6b9b3e5d75..91d12b17df4 100755
--- a/cleanup-user.sh
+++ b/cleanup-user.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -ex
 
-teuthology-lock --list-targets --owner $1 > /tmp/$$
+teuthology-lock --list-targets --owner $1 --status up > /tmp/$$
 teuthology-nuke --unlock -t /tmp/$$ -r --owner $1
 rm /tmp/$$
 
diff --git a/schedule_suite.sh b/schedule_suite.sh
index a5f27ed1843..70da58f738d 100755
--- a/schedule_suite.sh
+++ b/schedule_suite.sh
@@ -38,12 +38,12 @@ tasks:
 - chef:
 - clock:
 overrides:
+  workunit:
+    sha1: $CEPH_SHA1
   ceph:
     sha1: $CEPH_SHA1
     log-whitelist:
     - slow request
-  workunit:
-    sha1: $CEPH_SHA1
 EOF
 
 if [ "$flavor" = "gcov" ]; then