diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go
index 9b8ac651ac4..df0d407ff30 100644
--- a/test/e2e/cluster_upgrade.go
+++ b/test/e2e/cluster_upgrade.go
@@ -209,8 +209,8 @@ func (cma *chaosMonkeyAdapter) Test(sem *chaosmonkey.Semaphore) {
 		return
 	}
 
-	cma.test.Setup(cma.framework)
 	defer cma.test.Teardown(cma.framework)
+	cma.test.Setup(cma.framework)
 	sem.Ready()
 	cma.test.Test(cma.framework, sem.StopCh, cma.upgradeType)
 }
diff --git a/test/e2e/upgrades/upgrade.go b/test/e2e/upgrades/upgrade.go
index 8efc26373e8..510999a543e 100644
--- a/test/e2e/upgrades/upgrade.go
+++ b/test/e2e/upgrades/upgrade.go
@@ -56,8 +56,9 @@ type Test interface {
 	// begin.
 	Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType)
 
-	// TearDown should clean up any objects that are created that
-	// aren't already cleaned up by the framework.
+	// Teardown should clean up any objects that are created that
+	// aren't already cleaned up by the framework. This will
+	// always be called, even if Setup failed.
 	Teardown(f *framework.Framework)
 }