diff --git a/pkg/com/net_test.go b/pkg/com/net_test.go
index 44c21805..fa7d3130 100644
--- a/pkg/com/net_test.go
+++ b/pkg/com/net_test.go
@@ -49,8 +49,9 @@ func TestWebsocket(t *testing.T) {
 }
 
 func testWebsocket(t *testing.T) {
-	server := newServer(t)
-	client := newClient(t, url.URL{Scheme: "ws", Host: "localhost:8080", Path: "/ws"})
+	addr := ":8989"
+	server := newServer(addr, t)
+	client := newClient(t, url.URL{Scheme: "ws", Host: "localhost" + addr, Path: "/ws"})
 	clDone := client.ProcessPackets(func(in TestIn) error { return nil })
 
 	if server.conn == nil {
@@ -190,15 +191,15 @@ func (s *serverHandler) serve(t *testing.T) func(w http.ResponseWriter, r *http.
 	}
 }
 
-func newServer(t *testing.T) *serverHandler {
+func newServer(addr string, t *testing.T) *serverHandler {
 	var wg sync.WaitGroup
 	handler := serverHandler{}
 	http.HandleFunc("/ws", handler.serve(t))
 	wg.Add(1)
 	go func() {
 		wg.Done()
-		if err := http.ListenAndServe(":8080", nil); err != nil {
-			t.Errorf("no server")
+		if err := http.ListenAndServe(addr, nil); err != nil {
+			t.Errorf("no server, %v", err)
 			return
 		}
 	}()
diff --git a/pkg/network/httpx/listener_test.go b/pkg/network/httpx/listener_test.go
index 49be5aac..c8d06eb4 100644
--- a/pkg/network/httpx/listener_test.go
+++ b/pkg/network/httpx/listener_test.go
@@ -13,7 +13,6 @@ func TestListenerCreation(t *testing.T) {
 		random bool
 		error  bool
 	}{
-		{addr: ":80", port: "80"},
 		{addr: ":", random: true},
 		{addr: ":0", random: true},
 		{addr: "", random: true},
@@ -38,14 +37,14 @@ func TestListenerCreation(t *testing.T) {
 			continue
 		}
 
-		defer func() { _ = ls.Close() }()
-
 		addr := ls.Addr().(*net.TCPAddr)
 		port := ls.GetPort()
 
 		hasPort := port > 0
 		isPortSame := strings.HasSuffix(addr.String(), ":"+test.port)
 
+		_ = ls.Close()
+
 		if test.random {
 			if !hasPort {
 				t.Errorf("expected a random port, got %v", port)
@@ -64,7 +63,7 @@ func TestFailOnPortInUse(t *testing.T) {
 	if err != nil {
 		t.Errorf("expected no error, got %v", err)
 	}
-	defer a.Close()
+	defer func() { _ = a.Close() }()
 	_, err = NewListener(":3333", false)
 	if err == nil {
 		t.Errorf("expected busy port error, but got none")
@@ -76,10 +75,10 @@ func TestListenerPortRoll(t *testing.T) {
 	if err != nil {
 		t.Errorf("expected no error, got %v", err)
 	}
-	defer a.Close()
+	defer func() { _ = a.Close() }()
 	b, err := NewListener("127.0.0.1:3333", true)
 	if err != nil {
 		t.Errorf("expected no port error, but got %v", err)
 	}
-	b.Close()
+	_ = b.Close()
 }
diff --git a/pkg/worker/room_test.go b/pkg/worker/room_test.go
index 3d3543bf..91c09b20 100644
--- a/pkg/worker/room_test.go
+++ b/pkg/worker/room_test.go
@@ -227,22 +227,6 @@ func getRoomMock(cfg roomMockConfig) roomMock {
 		room.StartEmulator()
 	}
 
-	// loop-wait the room initialization
-	var init sync.WaitGroup
-	init.Add(1)
-	wasted := 0
-	go func() {
-		sleepDeltaMs := 10
-		for room.emulator == nil {
-			time.Sleep(time.Duration(sleepDeltaMs) * time.Millisecond)
-			wasted++
-			if wasted > 1000 {
-				break
-			}
-		}
-		init.Done()
-	}()
-	init.Wait()
 	return roomMock{Room: room, startEmulator: !cfg.dontStartEmulator}
 }