diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index f65b6d0b1..82ed69ae5 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -52,6 +52,9 @@ func NewCLI() *CLI {
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
+			if !cli.preserve {
+				defer Cleanup(cli.testnet)
+			}
 			if err := Setup(cli.testnet); err != nil {
 				return err
 			}
@@ -103,11 +106,6 @@ func NewCLI() *CLI {
 			if err := Test(cli.testnet); err != nil {
 				return err
 			}
-			if !cli.preserve {
-				if err := Cleanup(cli.testnet); err != nil {
-					return err
-				}
-			}
 			return nil
 		},
 	}