diff --git a/testing/servers/tcp/tcp.go b/testing/servers/tcp/tcp.go
index 42b9e1ea..62852144 100644
--- a/testing/servers/tcp/tcp.go
+++ b/testing/servers/tcp/tcp.go
@@ -32,7 +32,6 @@ func (server *Server) Start() (v2net.Destination, error) {
 
 func (server *Server) acceptConnections(listener *net.TCPListener) {
 	server.accepting = true
-	defer listener.Close()
 	for server.accepting {
 		conn, err := listener.Accept()
 		if err != nil {
diff --git a/testing/servers/udp/udp.go b/testing/servers/udp/udp.go
index 657d9e8c..8cbf3bb9 100644
--- a/testing/servers/udp/udp.go
+++ b/testing/servers/udp/udp.go
@@ -31,8 +31,7 @@ func (server *Server) Start() (v2net.Destination, error) {
 
 func (server *Server) handleConnection(conn *net.UDPConn) {
 	server.accepting = true
-	defer conn.Close()
-	for {
+	for server.accepting {
 		buffer := make([]byte, 2*1024)
 		nBytes, addr, err := conn.ReadFromUDP(buffer)
 		if err != nil {