diff --git a/cmd/nginx/main_test.go b/cmd/nginx/main_test.go
index a3b6a6b20..03b088b68 100644
--- a/cmd/nginx/main_test.go
+++ b/cmd/nginx/main_test.go
@@ -50,37 +50,41 @@ func init() {
 }
 
 func TestHandleSigterm(t *testing.T) {
+	const (
+		podName   = "test"
+		namespace = "test"
+	)
+
 	clientSet := fake.NewSimpleClientset()
 
-	ns := "test"
+	createConfigMap(clientSet, namespace, t)
 
-	cm := createConfigMap(clientSet, ns, t)
-	defer deleteConfigMap(cm, ns, clientSet, t)
-
-	name := "test"
 	pod := corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: ns,
+			Name:      podName,
+			Namespace: namespace,
 		},
 	}
 
-	_, err := clientSet.CoreV1().Pods(ns).Create(&pod)
+	_, err := clientSet.CoreV1().Pods(namespace).Create(&pod)
 	if err != nil {
 		t.Fatalf("error creating pod %v: %v", pod, err)
 	}
 
 	resetForTesting(func() { t.Fatal("bad parse") })
 
-	os.Setenv("POD_NAME", name)
-	os.Setenv("POD_NAMESPACE", ns)
-	defer os.Setenv("POD_NAME", "")
-	defer os.Setenv("POD_NAMESPACE", "")
+	os.Setenv("POD_NAME", podName)
+	os.Setenv("POD_NAMESPACE", namespace)
 
 	oldArgs := os.Args
-	defer func() { os.Args = oldArgs }()
-	os.Args = []string{"cmd", "--default-backend-service", "ingress-nginx/default-backend-http", "--http-port", "0", "--https-port", "0"}
 
+	defer func() {
+		os.Setenv("POD_NAME", "")
+		os.Setenv("POD_NAMESPACE", "")
+		os.Args = oldArgs
+	}()
+
+	os.Args = []string{"cmd", "--default-backend-service", "ingress-nginx/default-backend-http", "--http-port", "0", "--https-port", "0"}
 	_, conf, err := parseFlags()
 	if err != nil {
 		t.Errorf("Unexpected error creating NGINX controller: %v", err)
@@ -102,16 +106,10 @@ func TestHandleSigterm(t *testing.T) {
 	if err != nil {
 		t.Error("Unexpected error sending SIGTERM signal.")
 	}
-
-	err = clientSet.CoreV1().Pods(ns).Delete(name, &metav1.DeleteOptions{})
-	if err != nil {
-		t.Fatalf("error deleting pod %v: %v", pod, err)
-	}
 }
 
 func createConfigMap(clientSet kubernetes.Interface, ns string, t *testing.T) string {
 	t.Helper()
-	t.Log("Creating temporal config map")
 
 	configMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
@@ -124,18 +122,6 @@ func createConfigMap(clientSet kubernetes.Interface, ns string, t *testing.T) st
 	if err != nil {
 		t.Errorf("error creating the configuration map: %v", err)
 	}
-	t.Logf("Temporal configmap %v created", cm)
 
 	return cm.Name
 }
-
-func deleteConfigMap(cm, ns string, clientSet kubernetes.Interface, t *testing.T) {
-	t.Helper()
-	t.Logf("Deleting temporal configmap %v", cm)
-
-	err := clientSet.CoreV1().ConfigMaps(ns).Delete(cm, &metav1.DeleteOptions{})
-	if err != nil {
-		t.Errorf("error deleting the configmap: %v", err)
-	}
-	t.Logf("Temporal configmap %v deleted", cm)
-}