diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go
new file mode 100644
index 00000000000..b7d438c3751
--- /dev/null
+++ b/test/e2e/namespace.go
@@ -0,0 +1,101 @@
+/*
+Copyright 2014 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package e2e
+
+import (
+	"fmt"
+	//"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait"
+	"strings"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+func countRemaining(c *client.Client, withName string) (int, error) {
+	var cnt = 0
+	nsList, err := c.Namespaces().List(labels.Everything(), fields.Everything())
+	for _, item := range nsList.Items {
+		if strings.Contains(item.Name, "nslifetest") {
+			cnt++
+		}
+	}
+	return cnt, err
+}
+
+func extinguish(c *client.Client, totalNS int, maxAllowedAfterDel int, maxSeconds int) {
+
+	var err error
+
+	for n := 0; n < totalNS; n += 1 {
+		_, err = createTestingNS(fmt.Sprintf("nslifetest-%v", n), c)
+		Expect(err).NotTo(HaveOccurred())
+	}
+
+	//Wait 10 seconds, then SEND delete requests for all the namespaces.
+	time.Sleep(time.Duration(10 * time.Second))
+	nsList, err := c.Namespaces().List(labels.Everything(), fields.Everything())
+	Expect(err).NotTo(HaveOccurred())
+	for _, item := range nsList.Items {
+		if strings.Contains(item.Name, "nslifetest") {
+			if err := c.Namespaces().Delete(item.Name); err != nil {
+				Failf("Failed deleting error ::: --- %v ", err)
+			}
+		}
+		Logf("namespace : %v api call to delete is complete ", item)
+	}
+
+	//Now POLL until all namespaces have been eradicated.
+	expectNoError(wait.Poll(2*time.Second, time.Duration(maxSeconds)*time.Second,
+		func() (bool, error) {
+			if rem, err := countRemaining(c, "nslifetest"); err != nil || rem > maxAllowedAfterDel {
+				Logf("Remaining namespaces : %v", rem)
+				return false, err
+			} else {
+				return true, nil
+			}
+		}))
+
+}
+
+var _ = Describe("Namespaces", func() {
+
+	//This namespace is modified throughout the course of the test.
+	var c *client.Client
+	var err error = nil
+	BeforeEach(func() {
+		By("Creating a kubernetes client")
+		c, err = loadClient()
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	AfterEach(func() {
+	})
+
+	//Confirms that namespace draining is functioning reasonably
+	//at minute intervals.
+	It("Delete 90 percent of 100 namespace in 150 seconds",
+		func() { extinguish(c, 100, 10, 150) })
+
+	//comprehensive draining ; uncomment after #7372
+	PIt("Delete ALL of 100 namespace in 150 seconds",
+		func() { extinguish(c, 100, 0, 150) })
+})