13 files changed, 20 insertions, 1 deletions
diff --git a/test/auto_test.go b/test/auto_test.go
index c44a2a8c3..7b615765a 100644
--- a/test/auto_test.go
+++ b/test/auto_test.go
@@ -16,6 +16,7 @@ import (
 )
 
 func TestAuto(t *testing.T) {
+	t.Parallel()
 	tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
 	if err != nil {
 		t.Fatal(err)
@@ -81,6 +82,7 @@ func TestAuto(t *testing.T) {
 }
 
 func TestAutoNonExistentZone(t *testing.T) {
+	t.Parallel()
 	tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
 	if err != nil {
 		t.Fatal(err)
@@ -119,6 +121,7 @@ func TestAutoNonExistentZone(t *testing.T) {
 }
 
 func TestAutoAXFR(t *testing.T) {
+	t.Parallel()
 	log.SetOutput(ioutil.Discard)
 
 	tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
diff --git a/test/cache_test.go b/test/cache_test.go
index 5156e4d13..f1cdbe76f 100644
--- a/test/cache_test.go
+++ b/test/cache_test.go
@@ -14,6 +14,7 @@ import (
 )
 
 func TestLookupCache(t *testing.T) {
+	t.Parallel()
 	// Start auth. CoreDNS holding the auth zone.
 	name, rm, err := test.TempFile(".", exampleOrg)
 	if err != nil {
diff --git a/test/ds_file_test.go b/test/ds_file_test.go
index 407e04b42..b1fd7b2df 100644
--- a/test/ds_file_test.go
+++ b/test/ds_file_test.go
@@ -32,6 +32,7 @@ var dsTestCases = []mtest.Case{
 }
 
 func TestLookupDS(t *testing.T) {
+	t.Parallel()
 	name, rm, err := TempFile(".", miekNL)
 	if err != nil {
 		t.Fatalf("failed to created zone: %s", err)
diff --git a/test/etcd_test.go b/test/etcd_test.go
index a21fa6296..f627e3872 100644
--- a/test/etcd_test.go
+++ b/test/etcd_test.go
@@ -31,7 +31,7 @@ func etcdMiddleware() *etcd.Etcd {
 
 // This test starts two coredns servers (and needs etcd). Configure a stubzones in both (that will loop) and
 // will then test if we detect this loop.
-func TestEtcdStubForwarding(t *testing.T) {
+func TestEtcdStubLoop(t *testing.T) {
 	// TODO(miek)
 }
 
diff --git a/test/file_reload_test.go b/test/file_reload_test.go
index de782cbf8..0e0bcadfc 100644
--- a/test/file_reload_test.go
+++ b/test/file_reload_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestZoneReload(t *testing.T) {
+	t.Parallel()
 	log.SetOutput(ioutil.Discard)
 
 	name, rm, err := TempFile(".", exampleOrg)
diff --git a/test/file_test.go b/test/file_test.go
index ed86a8260..d4167e38e 100644
--- a/test/file_test.go
+++ b/test/file_test.go
@@ -3,6 +3,7 @@ package test
 import "testing"
 
 func TestTempFile(t *testing.T) {
+	t.Parallel()
 	_, f, e := TempFile(".", "test")
 	if e != nil {
 		t.Fatalf("failed to create temp file: %s", e)
diff --git a/test/kubernetes_test.go b/test/kubernetes_test.go
index 02f731475..49d3834d8 100644
--- a/test/kubernetes_test.go
+++ b/test/kubernetes_test.go
@@ -242,6 +242,7 @@ func createTestServer(t *testing.T, corefile string) (*caddy.Instance, string) {
 }
 
 func TestKubernetesIntegration(t *testing.T) {
+	t.Parallel()
 	corefile :=
 		`.:0 {
     kubernetes cluster.local 0.0.10.in-addr.arpa {
diff --git a/test/metrics_test.go b/test/metrics_test.go
index cced6b237..f51e2fb1c 100644
--- a/test/metrics_test.go
+++ b/test/metrics_test.go
@@ -16,6 +16,8 @@ import (
 	"github.com/miekg/dns"
 )
 
+// fail when done in parallel
+
 // Start test server that has metrics enabled. Then tear it down again.
 func TestMetricsServer(t *testing.T) {
 	corefile := `example.org:0 {
diff --git a/test/middleware_dnssec_test.go b/test/middleware_dnssec_test.go
index 692e39141..52c54f801 100644
--- a/test/middleware_dnssec_test.go
+++ b/test/middleware_dnssec_test.go
@@ -12,6 +12,7 @@ import (
 )
 
 func TestLookupBalanceRewriteCacheDnssec(t *testing.T) {
+	t.Parallel()
 	name, rm, err := test.TempFile(".", exampleOrg)
 	if err != nil {
 		t.Fatalf("failed to created zone: %s", err)
diff --git a/test/proxy_test.go b/test/proxy_test.go
index b8765ef10..01bfa0500 100644
--- a/test/proxy_test.go
+++ b/test/proxy_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestLookupProxy(t *testing.T) {
+	t.Parallel()
 	name, rm, err := test.TempFile(".", exampleOrg)
 	if err != nil {
 		t.Fatalf("failed to created zone: %s", err)
diff --git a/test/server.go b/test/server.go
index d472cc7d0..b290d5a22 100644
--- a/test/server.go
+++ b/test/server.go
@@ -3,6 +3,7 @@ package test
 import (
 	"io/ioutil"
 	"log"
+	"sync"
 
 	"github.com/miekg/coredns/core/dnsserver"
 
@@ -12,8 +13,12 @@ import (
 	"github.com/mholt/caddy"
 )
 
+var mu sync.Mutex
+
 // CoreDNSServer returns a CoreDNS test server. It just takes a normal Corefile as input.
 func CoreDNSServer(corefile string) (*caddy.Instance, error) {
+	mu.Lock()
+	defer mu.Unlock()
 	caddy.Quiet = true
 	dnsserver.Quiet = true
 	log.SetOutput(ioutil.Discard)
diff --git a/test/server_test.go b/test/server_test.go
index 58e929e96..b7abc86c3 100644
--- a/test/server_test.go
+++ b/test/server_test.go
@@ -8,6 +8,7 @@ import (
 
 // Start 2 tests server, server A will proxy to B, server B is an CH server.
 func TestProxyToChaosServer(t *testing.T) {
+	t.Parallel()
 	corefile := `.:0 {
 	chaos CoreDNS-001 miek@miek.nl
 }
diff --git a/test/wildcard_test.go b/test/wildcard_test.go
index 57cfdc75a..d6910e013 100644
--- a/test/wildcard_test.go
+++ b/test/wildcard_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestLookupWildcard(t *testing.T) {
+	t.Parallel()
 	name, rm, err := test.TempFile(".", exampleOrg)
 	if err != nil {
 		t.Fatalf("failed to created zone: %s", err)