diff --git a/serverconn_test.go b/serverconn_test.go
index d577d2dd..404e8fc3 100644
--- a/serverconn_test.go
+++ b/serverconn_test.go
@@ -416,7 +416,7 @@ func TestServerCSeq(t *testing.T) {
 	require.Equal(t, base.HeaderValue{"5"}, res.Header["CSeq"])
 }
 
-func TestServerCSeqMissing(t *testing.T) {
+func TestServerErrorCSeqMissing(t *testing.T) {
 	s, err := Serve("127.0.0.1:8554")
 	require.NoError(t, err)
 	defer s.Close()
diff --git a/serverconnpublish_test.go b/serverconnpublish_test.go
index bab67167..dc69289d 100644
--- a/serverconnpublish_test.go
+++ b/serverconnpublish_test.go
@@ -187,7 +187,7 @@ func TestServerPublishSetupPath(t *testing.T) {
 	}
 }
 
-func TestServerPublishSetupDifferentPaths(t *testing.T) {
+func TestServerPublishSetupErrorDifferentPaths(t *testing.T) {
 	serverErr := make(chan error)
 
 	s, err := Serve("127.0.0.1:8554")
@@ -285,7 +285,7 @@ func TestServerPublishSetupDifferentPaths(t *testing.T) {
 	require.Equal(t, "invalid track path (test2stream/trackID=0)", err.Error())
 }
 
-func TestServerPublishSetupTrackTwice(t *testing.T) {
+func TestServerPublishSetupErrorTrackTwice(t *testing.T) {
 	serverErr := make(chan error)
 
 	s, err := Serve("127.0.0.1:8554")
@@ -397,7 +397,7 @@ func TestServerPublishSetupTrackTwice(t *testing.T) {
 	require.Equal(t, "track 0 has already been setup", err.Error())
 }
 
-func TestServerPublishRecordPartialTracks(t *testing.T) {
+func TestServerPublishRecordErrorPartialTracks(t *testing.T) {
 	serverErr := make(chan error)
 
 	s, err := Serve("127.0.0.1:8554")
@@ -524,7 +524,7 @@ func TestServerPublishFrames(t *testing.T) {
 		"tcp",
 	} {
 		t.Run(proto, func(t *testing.T) {
-			packetsReceived := make(chan struct{})
+			framesReceived := make(chan struct{})
 
 			conf := ServerConf{}
 
@@ -574,7 +574,7 @@ func TestServerPublishFrames(t *testing.T) {
 						require.Equal(t, 0, trackID)
 						require.Equal(t, StreamTypeRTCP, typ)
 						require.Equal(t, []byte("\x05\x06\x07\x08"), buf)
-						close(packetsReceived)
+						close(framesReceived)
 					}
 				}
 
@@ -706,12 +706,12 @@ func TestServerPublishFrames(t *testing.T) {
 				require.NoError(t, err)
 			}
 
-			<-packetsReceived
+			<-framesReceived
 		})
 	}
 }
 
-func TestServerPublishFramesWrongProtocol(t *testing.T) {
+func TestServerPublishFramesErrorWrongProtocol(t *testing.T) {
 	conf := ServerConf{
 		UDPRTPAddress:  "127.0.0.1:8000",
 		UDPRTCPAddress: "127.0.0.1:8001",
diff --git a/serverconnread_test.go b/serverconnread_test.go
index 8eb05f30..9a0ebe69 100644
--- a/serverconnread_test.go
+++ b/serverconnread_test.go
@@ -129,7 +129,7 @@ func TestServerReadSetupPath(t *testing.T) {
 	}
 }
 
-func TestServerReadSetupDifferentPaths(t *testing.T) {
+func TestServerReadSetupErrorDifferentPaths(t *testing.T) {
 	serverErr := make(chan error)
 
 	s, err := Serve("127.0.0.1:8554")
@@ -210,7 +210,7 @@ func TestServerReadSetupDifferentPaths(t *testing.T) {
 	require.Equal(t, "can't setup tracks with different paths", err.Error())
 }
 
-func TestServerReadSetupTrackTwice(t *testing.T) {
+func TestServerReadSetupErrorTrackTwice(t *testing.T) {
 	serverErr := make(chan error)
 
 	s, err := Serve("127.0.0.1:8554")
@@ -297,7 +297,7 @@ func TestServerReadFrames(t *testing.T) {
 		"tcp",
 	} {
 		t.Run(proto, func(t *testing.T) {
-			packetsReceived := make(chan struct{})
+			framesReceived := make(chan struct{})
 
 			conf := ServerConf{
 				UDPRTPAddress:  "127.0.0.1:8000",
@@ -333,7 +333,7 @@ func TestServerReadFrames(t *testing.T) {
 					require.Equal(t, 0, trackID)
 					require.Equal(t, StreamTypeRTCP, typ)
 					require.Equal(t, []byte("\x01\x02\x03\x04"), buf)
-					close(packetsReceived)
+					close(framesReceived)
 				}
 
 				<-conn.Read(ServerConnReadHandlers{
@@ -419,7 +419,7 @@ func TestServerReadFrames(t *testing.T) {
 				require.NoError(t, err)
 			}
 
-			<-packetsReceived
+			<-framesReceived
 		})
 	}
 }