diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go
index 02317e204c0..e91fd69130d 100644
--- a/test/e2e/apimachinery/aggregator.go
+++ b/test/e2e/apimachinery/aggregator.go
@@ -53,12 +53,6 @@ var _ = SIGDescribe("Aggregator", func() {
 	var c clientset.Interface
 	var aggrclient *aggregatorclient.Clientset
 	f := framework.NewDefaultFramework("aggregator")
-	framework.AddCleanupAction(func() {
-		// Cleanup actions will be called even when the tests are skipped and leaves namespace unset.
-		if len(ns) > 0 {
-			cleanTest(c, aggrclient, ns)
-		}
-	})
 
 	BeforeEach(func() {
 		c = f.ClientSet
@@ -66,6 +60,10 @@ var _ = SIGDescribe("Aggregator", func() {
 		aggrclient = f.AggregatorClient
 	})
 
+	AfterEach(func() {
+		cleanTest(c, aggrclient, ns)
+	})
+
 	It("Should be able to support the 1.7 Sample API Server using the current Aggregator", func() {
 		// Make sure the relevant provider supports Agggregator
 		framework.SkipUnlessServerVersionGTE(serverAggregatorVersion, f.ClientSet.Discovery())