diff --git a/test/e2e/framework.go b/test/e2e/framework.go
index 626d140cdbb..8c191579847 100644
--- a/test/e2e/framework.go
+++ b/test/e2e/framework.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/api"
+	apierrs "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
@@ -146,7 +147,11 @@ func (f *Framework) afterEach() {
 					timeout = f.NamespaceDeletionTimeout
 				}
 				if err := deleteNS(f.Client, ns.Name, timeout); err != nil {
-					Failf("Couldn't delete ns %q: %s", ns.Name, err)
+					if !apierrs.IsNotFound(err) {
+						Failf("Couldn't delete ns %q: %s", ns.Name, err)
+					} else {
+						Logf("Namespace %v was already deleted", ns.Name)
+					}
 				}
 			}
 			f.namespacesToDelete = nil
diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go
index 8fa3690ce42..6cfe52f1a5e 100644
--- a/test/e2e/namespace.go
+++ b/test/e2e/namespace.go
@@ -34,8 +34,8 @@ func extinguish(f *Framework, totalNS int, maxAllowedAfterDel int, maxSeconds in
 
 	By("Creating testing namespaces")
 	wg := &sync.WaitGroup{}
+	wg.Add(totalNS)
 	for n := 0; n < totalNS; n += 1 {
-		wg.Add(1)
 		go func(n int) {
 			defer wg.Done()
 			defer GinkgoRecover()