diff --git a/testing/scenarios/command_test.go b/testing/scenarios/command_test.go
index c5f9f35c..ace50ca0 100644
--- a/testing/scenarios/command_test.go
+++ b/testing/scenarios/command_test.go
@@ -3,6 +3,7 @@ package scenarios
 import (
 	"context"
 	"fmt"
+	"io"
 	"testing"
 	"time"
 
@@ -264,8 +265,8 @@ func TestCommanderAddRemoveUser(t *testing.T) {
 	common.Must(err)
 	defer CloseAllServers(servers)
 
-	if err := testTCPConn(clientPort, 1024, time.Second*5)(); err != nil {
-		t.Fatal(err)
+	if err := testTCPConn(clientPort, 1024, time.Second*5)(); err != io.EOF {
+		t.Fatal("expected error: ", err)
 	}
 
 	cmdConn, err := grpc.Dial(fmt.Sprintf("127.0.0.1:%d", cmdPort), grpc.WithInsecure(), grpc.WithBlock())
diff --git a/testing/scenarios/feature_test.go b/testing/scenarios/feature_test.go
index 51caa82a..454b2a61 100644
--- a/testing/scenarios/feature_test.go
+++ b/testing/scenarios/feature_test.go
@@ -537,7 +537,7 @@ func TestUDPConnection(t *testing.T) {
 
 	servers, err := InitializeServerConfigs(clientConfig)
 	common.Must(err)
-	CloseAllServers(servers)
+	defer CloseAllServers(servers)
 
 	if err := testUDPConn(clientPort, 1024, time.Second*5)(); err != nil {
 		t.Error(err)
diff --git a/testing/scenarios/vmess_test.go b/testing/scenarios/vmess_test.go
index c080f3b4..9fe99778 100644
--- a/testing/scenarios/vmess_test.go
+++ b/testing/scenarios/vmess_test.go
@@ -452,7 +452,7 @@ func TestVMessGCMUDP(t *testing.T) {
 
 	servers, err := InitializeServerConfigs(serverConfig, clientConfig)
 	common.Must(err)
-	CloseAllServers(servers)
+	defer CloseAllServers(servers)
 
 	var errg errgroup.Group
 	for i := 0; i < 10; i++ {