diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index 82ed69ae5..73be1111c 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -267,6 +267,8 @@ Does not run any perbutations.
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
+			defer Cleanup(cli.testnet)
+
 			if err := Setup(cli.testnet); err != nil {
 				return err
 			}
@@ -300,10 +302,6 @@ Does not run any perbutations.
 				return err
 			}
 
-			if err := Cleanup(cli.testnet); err != nil {
-				return err
-			}
-
 			return nil
 		},
 	})