diff --git a/server_publish_test.go b/server_publish_test.go
index 719178a3..c904dc1c 100644
--- a/server_publish_test.go
+++ b/server_publish_test.go
@@ -163,6 +163,7 @@ func TestServerPublishErrorAnnounce(t *testing.T) {
 
 			err := s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			conn, err := net.Dial("tcp", "localhost:8554")
@@ -249,6 +250,7 @@ func TestServerPublishSetupPath(t *testing.T) {
 
 			err := s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			conn, err := net.Dial("tcp", "localhost:8554")
@@ -344,6 +346,7 @@ func TestServerPublishErrorSetupDifferentPaths(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -426,6 +429,7 @@ func TestServerPublishErrorSetupTrackTwice(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -525,6 +529,7 @@ func TestServerPublishErrorRecordPartialTracks(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -669,6 +674,7 @@ func TestServerPublish(t *testing.T) {
 
 			err := s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			nconn, err := net.Dial("tcp", "localhost:8554")
@@ -864,6 +870,7 @@ func TestServerPublishErrorInvalidProtocol(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -965,6 +972,7 @@ func TestServerPublishRTCPReport(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -1124,6 +1132,7 @@ func TestServerPublishTimeout(t *testing.T) {
 
 			err := s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			nconn, err := net.Dial("tcp", "localhost:8554")
@@ -1252,6 +1261,7 @@ func TestServerPublishWithoutTeardown(t *testing.T) {
 
 			err := s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			nconn, err := net.Dial("tcp", "localhost:8554")
@@ -1367,6 +1377,7 @@ func TestServerPublishUDPChangeConn(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	sxID := ""
diff --git a/server_read_test.go b/server_read_test.go
index 3eed256f..7c544079 100644
--- a/server_read_test.go
+++ b/server_read_test.go
@@ -108,6 +108,7 @@ func TestServerReadSetupPath(t *testing.T) {
 
 			err = s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			conn, err := net.Dial("tcp", "localhost:8554")
@@ -172,6 +173,7 @@ func TestServerReadSetupErrors(t *testing.T) {
 
 			err = s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			conn, err := net.Dial("tcp", "localhost:8554")
@@ -338,6 +340,7 @@ func TestServerRead(t *testing.T) {
 			listenIP := multicastCapableIP(t)
 			err = s.Start(listenIP + ":8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			nconn, err := net.Dial("tcp", listenIP+":8554")
@@ -616,6 +619,7 @@ func TestServerReadTCPResponseBeforeFrames(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -687,6 +691,7 @@ func TestServerReadPlayPlay(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -794,6 +799,7 @@ func TestServerReadPlayPausePlay(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -908,6 +914,7 @@ func TestServerReadPlayPausePause(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -1020,6 +1027,7 @@ func TestServerReadTimeout(t *testing.T) {
 
 			err = s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			nconn, err := net.Dial("tcp", "localhost:8554")
@@ -1117,6 +1125,7 @@ func TestServerReadWithoutTeardown(t *testing.T) {
 
 			err = s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			nconn, err := net.Dial("tcp", "localhost:8554")
@@ -1205,6 +1214,7 @@ func TestServerReadUDPChangeConn(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	sxID := ""
@@ -1298,6 +1308,7 @@ func TestServerReadErrorUDPSamePorts(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	func() {
@@ -1403,6 +1414,7 @@ func TestServerReadNonSetuppedPath(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -1567,6 +1579,7 @@ func TestServerReadAdditionalInfos(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	buf, err := (&rtp.Packet{
diff --git a/server_test.go b/server_test.go
index 27fdc561..7198734e 100644
--- a/server_test.go
+++ b/server_test.go
@@ -420,6 +420,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
 
 			err := s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			switch ca.publisherSoft {
@@ -520,6 +521,7 @@ func TestServerClose(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	s.Close()
 	s.Close()
 }
@@ -561,6 +563,7 @@ func TestServerConnClose(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -574,6 +577,7 @@ func TestServerCSeq(t *testing.T) {
 	s := &Server{}
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -607,6 +611,7 @@ func TestServerErrorCSeqMissing(t *testing.T) {
 	s := &Server{Handler: h}
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -638,6 +643,7 @@ func TestServerErrorInvalidMethod(t *testing.T) {
 	s := &Server{Handler: h}
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -686,6 +692,7 @@ func TestServerErrorTCPTwoConnOneSession(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn1, err := net.Dial("tcp", "localhost:8554")
@@ -783,6 +790,7 @@ func TestServerErrorTCPOneConnTwoSessions(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -868,6 +876,7 @@ func TestServerGetSetParameter(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -939,6 +948,7 @@ func TestServerErrorInvalidSession(t *testing.T) {
 
 			err := s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			conn, err := net.Dial("tcp", "localhost:8554")
@@ -981,6 +991,7 @@ func TestServerSessionClose(t *testing.T) {
 
 	err := s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -1035,6 +1046,7 @@ func TestServerSessionAutoClose(t *testing.T) {
 
 	err = s.Start("localhost:8554")
 	require.NoError(t, err)
+	defer s.Wait()
 	defer s.Close()
 
 	conn, err := net.Dial("tcp", "localhost:8554")
@@ -1112,6 +1124,7 @@ func TestServerErrorInvalidPath(t *testing.T) {
 
 			err = s.Start("localhost:8554")
 			require.NoError(t, err)
+			defer s.Wait()
 			defer s.Close()
 
 			conn, err := net.Dial("tcp", "localhost:8554")