diff --git a/tests/snapstack_test.py b/tests/snapstack_test.py
index 3db0659..cb6c87b 100644
--- a/tests/snapstack_test.py
+++ b/tests/snapstack_test.py
@@ -24,5 +24,9 @@ class SnapstackTest(unittest.TestCase):
             ],
             snap_store=False)
 
-        plan = Plan(tests=[cinder])
+        cinder_cleanup = Step(
+            script_loc='./tests/',
+            scripts=['cinder_cleanup.sh'])
+
+        plan = Plan(tests=[cinder], test_cleanup=[cinder_cleanup])
         plan.run()