4 files changed, 6 insertions, 22 deletions
diff --git a/test/kubernetes_api_fallthrough_test.go b/test/kubernetes_api_fallthrough_test.go
index 08d380f67..d12789c24 100644
--- a/test/kubernetes_api_fallthrough_test.go
+++ b/test/kubernetes_api_fallthrough_test.go
@@ -4,7 +4,6 @@ package test
 
 import (
 	"testing"
-	"time"
 
 	"github.com/coredns/coredns/plugin/test"
 
@@ -36,9 +35,6 @@ func TestKubernetesAPIFallthrough(t *testing.T) {
 	}
 	defer server.Stop()
 
-	// Work-around for timing condition that results in no-data being returned in test environment.
-	time.Sleep(3 * time.Second)
-
 	for _, tc := range tests {
 
 		c := new(dns.Client)
diff --git a/test/kubernetes_nsexposed_test.go b/test/kubernetes_nsexposed_test.go
index f5161c9a1..1b271a825 100644
--- a/test/kubernetes_nsexposed_test.go
+++ b/test/kubernetes_nsexposed_test.go
@@ -4,7 +4,6 @@ package test
 
 import (
 	"testing"
-	"time"
 
 	"github.com/coredns/coredns/plugin/test"
 
@@ -42,9 +41,6 @@ func TestKubernetesNSExposed(t *testing.T) {
 	}
 	defer server.Stop()
 
-	// Work-around for timing condition that results in no-data being returned in test environment.
-	time.Sleep(3 * time.Second)
-
 	for _, tc := range dnsTestCasesAllNSExposed {
 
 		c := new(dns.Client)
diff --git a/test/kubernetes_pods_test.go b/test/kubernetes_pods_test.go
index 67447f979..345366a41 100644
--- a/test/kubernetes_pods_test.go
+++ b/test/kubernetes_pods_test.go
@@ -4,7 +4,6 @@ package test
 
 import (
 	"testing"
-	"time"
 
 	"github.com/coredns/coredns/plugin/test"
 
@@ -30,11 +29,11 @@ var dnsTestCasesPodsInsecure = []test.Case{
 
 func TestKubernetesPodsInsecure(t *testing.T) {
 	corefile := `.:0 {
-    kubernetes cluster.local 0.0.10.in-addr.arpa {
-                endpoint http://localhost:8080
-                namespaces test-1
-                pods insecure
-    }
+kubernetes cluster.local 0.0.10.in-addr.arpa {
+	endpoint http://localhost:8080
+	namespaces test-1
+	pods insecure
+}
 `
 
 	server, udp, _, err := CoreDNSServerAndPorts(corefile)
@@ -43,9 +42,6 @@ func TestKubernetesPodsInsecure(t *testing.T) {
 	}
 	defer server.Stop()
 
-	// Work-around for timing condition that results in no-data being returned in test environment.
-	time.Sleep(3 * time.Second)
-
 	for _, tc := range dnsTestCasesPodsInsecure {
 
 		c := new(dns.Client)
@@ -92,9 +88,6 @@ func TestKubernetesPodsVerified(t *testing.T) {
 	}
 	defer server.Stop()
 
-	// Work-around for timing condition that results in no-data being returned in test environment.
-	time.Sleep(3 * time.Second)
-
 	for _, tc := range dnsTestCasesPodsVerified {
 
 		c := new(dns.Client)
diff --git a/test/kubernetes_test.go b/test/kubernetes_test.go
index c3004a951..b028373f5 100644
--- a/test/kubernetes_test.go
+++ b/test/kubernetes_test.go
@@ -279,8 +279,7 @@ func doIntegrationTests(t *testing.T, corefile string, testCases []test.Case) {
 	}
 	defer server.Stop()
 
-	// Work-around for timing condition that results in no-data being returned in test environment.
-	time.Sleep(3 * time.Second)
+	time.Sleep(1 * time.Second)
 
 	for _, tc := range testCases {