diff --git a/plugin/forward/setup_test.go b/plugin/forward/setup_test.go
index bfa51e161..ff3e2fad4 100644
--- a/plugin/forward/setup_test.go
+++ b/plugin/forward/setup_test.go
@@ -429,7 +429,6 @@ func TestFailfastAllUnhealthyUpstreams(t *testing.T) {
 }
 
 func TestFailover(t *testing.T) {
-
 	server_fail_s := dnstest.NewMultipleServer(func(w dns.ResponseWriter, r *dns.Msg) {
 		ret := new(dns.Msg)
 		ret.SetRcode(r, dns.RcodeServerFailure)
diff --git a/plugin/pkg/dnstest/server.go b/plugin/pkg/dnstest/server.go
index f247f7466..39b21e9ba 100644
--- a/plugin/pkg/dnstest/server.go
+++ b/plugin/pkg/dnstest/server.go
@@ -65,10 +65,10 @@ func NewMultipleServer(f dns.HandlerFunc) *Server {
 	ch2 := make(chan bool)
 
 	s1 := &dns.Server{
-		Handler: dns.HandlerFunc(f),
+		Handler: f,
 	} // udp
 	s2 := &dns.Server{
-		Handler: dns.HandlerFunc(f),
+		Handler: f,
 	} // tcp
 
 	for range 5 { // 5 attempts