diff --git a/test/probe/common.py b/test/probe/common.py
index 5bb4b5d546..cf1b6936ce 100644
--- a/test/probe/common.py
+++ b/test/probe/common.py
@@ -266,6 +266,11 @@ def get_policy(**kwargs):
 def resetswift():
     p = Popen("resetswift 2>&1", shell=True, stdout=PIPE)
     stdout, _stderr = p.communicate()
+    if p.returncode:
+        raise AssertionError(
+            'Cleanup with "resetswift" failed: stdout: %s, stderr: %s'
+            % (stdout, _stderr))
+
     print(stdout)
     Manager(['all']).stop()