diff --git a/internal/server/TLS.go b/internal/server/TLS.go
index 31350f3..ea53ca1 100644
--- a/internal/server/TLS.go
+++ b/internal/server/TLS.go
@@ -63,7 +63,7 @@ func (TLS) makeResponder(clientHelloSessionId []byte, sharedSecret [32]byte) Res
 		_, err = originalConn.Write(reply)
 		if err != nil {
 			err = fmt.Errorf("failed to write TLS reply: %v", err)
-			go originalConn.Close()
+			originalConn.Close()
 			return
 		}
 		preparedConn = &common.TLSConn{Conn: originalConn}
diff --git a/internal/server/websocket.go b/internal/server/websocket.go
index 60a2af0..e70617f 100644
--- a/internal/server/websocket.go
+++ b/internal/server/websocket.go
@@ -61,7 +61,7 @@ func (WebSocket) makeResponder(reqPacket []byte, sharedSecret [32]byte) Responde
 		_, err = preparedConn.Write(reply)
 		if err != nil {
 			err = fmt.Errorf("failed to write reply: %v", err)
-			go preparedConn.Close()
+			preparedConn.Close()
 			return
 		}
 		return
diff --git a/internal/test/integration_test.go b/internal/test/integration_test.go
index f6bcca2..f9820f9 100644
--- a/internal/test/integration_test.go
+++ b/internal/test/integration_test.go
@@ -21,6 +21,8 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+const numConns = 200 // -race option limits the number of goroutines to 8192
+
 func serveTCPEcho(l net.Listener) {
 	for {
 		conn, err := l.Accept()
@@ -178,7 +180,7 @@ func runEchoTest(t *testing.T, conns []net.Conn, maxMsgLen int) {
 func TestUDP(t *testing.T) {
 	var tmpDB, _ = ioutil.TempFile("", "ck_user_info")
 	defer os.Remove(tmpDB.Name())
-	log.SetLevel(log.TraceLevel)
+	log.SetLevel(log.FatalLevel)
 
 	worldState := common.WorldOfTime(time.Unix(10, 0))
 	lcc, rcc, ai := basicClientConfigs(worldState)
@@ -272,7 +274,6 @@ func TestTCP(t *testing.T) {
 
 	t.Run("user echo", func(t *testing.T) {
 		go serveTCPEcho(pxyServerL)
-		const numConns = 2000 // -race option limits the number of goroutines to 8192
 		var conns [numConns]net.Conn
 		for i := 0; i < numConns; i++ {
 			conns[i], err = pxyClientD.Dial("", "")
@@ -286,7 +287,6 @@ func TestTCP(t *testing.T) {
 
 	t.Run("redir echo", func(t *testing.T) {
 		go serveTCPEcho(rdirServerL)
-		const numConns = 2000 // -race option limits the number of goroutines to 8192
 		var conns [numConns]net.Conn
 		for i := 0; i < numConns; i++ {
 			conns[i], err = dialerToCkServer.Dial("", "")
@@ -371,7 +371,6 @@ func BenchmarkThroughput(b *testing.B) {
 			})
 
 			b.Run("multi conn", func(b *testing.B) {
-				const numConns = 1024
 				for i := 0; i < numConns; i++ {
 					go func() {
 						serverConn, _ := pxyServerL.Accept()