diff --git a/nameserver/mdns_client_test.go b/nameserver/mdns_client_test.go
index 4cc4f5b7..745b8fa7 100644
--- a/nameserver/mdns_client_test.go
+++ b/nameserver/mdns_client_test.go
@@ -67,7 +67,10 @@ func RunLocalMulticastServer() (*dns.Server, error) {
 	if err != nil {
 		return nil, err
 	}
-	server := &dns.Server{Listener: nil, PacketConn: multicast, Handler: dns.HandlerFunc(minimalServer)}
+	server := &dns.Server{
+		PacketConn:  multicast,
+		Handler:     dns.HandlerFunc(minimalServer),
+		ReadTimeout: 100 * time.Millisecond}
 	go server.ActivateAndServe()
 	return server, nil
 }
diff --git a/nameserver/mdns_server_test.go b/nameserver/mdns_server_test.go
index bd550c8e..cbb1c425 100644
--- a/nameserver/mdns_server_test.go
+++ b/nameserver/mdns_server_test.go
@@ -86,7 +86,11 @@ func TestServerSimpleQuery(t *testing.T) {
 		}
 	}
 
-	listener := &dns.Server{Unsafe: true, PacketConn: multicast, Handler: dns.HandlerFunc(handleMDNS)}
+	listener := &dns.Server{
+		Unsafe:      true,
+		PacketConn:  multicast,
+		Handler:     dns.HandlerFunc(handleMDNS),
+		ReadTimeout: 100 * time.Millisecond}
 	go listener.ActivateAndServe()
 	defer listener.Shutdown()
 
diff --git a/nameserver/server_test.go b/nameserver/server_test.go
index a1992477..caaa426d 100644
--- a/nameserver/server_test.go
+++ b/nameserver/server_test.go
@@ -265,7 +265,7 @@ func runLocalUDPServer(t *testing.T, laddr string, handler dns.HandlerFunc) (*dn
 	if err != nil {
 		return nil, "", err
 	}
-	server := &dns.Server{PacketConn: pc, Handler: handler}
+	server := &dns.Server{PacketConn: pc, Handler: handler, ReadTimeout: 100 * time.Millisecond}
 
 	go func() {
 		server.ActivateAndServe()
@@ -288,7 +288,7 @@ func runLocalTCPServer(t *testing.T, laddr string, handler dns.HandlerFunc) (*dn
 	if err != nil {
 		return nil, "", err
 	}
-	server := &dns.Server{Listener: l, Handler: handler}
+	server := &dns.Server{Listener: l, Handler: handler, ReadTimeout: 100 * time.Millisecond}
 
 	go func() {
 		server.ActivateAndServe()