diff --git a/test/integration/run-bats.sh b/test/integration/run-bats.sh
index 5c569e45ca..96072e0f22 100755
--- a/test/integration/run-bats.sh
+++ b/test/integration/run-bats.sh
@@ -73,6 +73,11 @@ export -f machine
 touch "$BATS_LOG"
 rm "$BATS_LOG"
 
+cleanup_machines
+if [[ -d "$MACHINE_STORAGE_PATH" ]]; then
+    rm -r "$MACHINE_STORAGE_PATH"
+fi
+
 run_bats "$BATS_FILE"
 
 if [[ -d "$MACHINE_STORAGE_PATH" ]]; then