diff --git a/gostream_test.go b/gostream_test.go
index e25d4e1..7b7ec39 100644
--- a/gostream_test.go
+++ b/gostream_test.go
@@ -45,17 +45,20 @@ func TestServerClient(t *testing.T) {
 	go func(ctx context.Context) {
 		listener, err := Listen(srvHost, tag)
 		if err != nil {
-			t.Fatal(err)
+			t.Error(err)
+			return
 		}
 		defer listener.Close()
 
 		if listener.Addr().String() != srvHost.ID().Pretty() {
-			t.Fatal("bad listener address")
+			t.Error("bad listener address")
+			return
 		}
 
 		servConn, err := listener.Accept()
 		if err != nil {
-			t.Fatal(err)
+			t.Error(err)
+			return
 		}
 		defer servConn.Close()
 
@@ -63,20 +66,20 @@ func TestServerClient(t *testing.T) {
 		for {
 			msg, err := reader.ReadString('\n')
 			if err != nil {
-				t.Fatal(err)
+				t.Error(err)
+				return
 			}
 			if string(msg) != "is libp2p awesome?\n" {
-				t.Fatalf("Bad incoming message: %s", msg)
+				t.Errorf("Bad incoming message: %s", msg)
+				return
 			}
 
 			_, err = servConn.Write([]byte("yes it is\n"))
 			if err != nil {
-				t.Fatal(err)
-			}
-			select {
-			case <-ctx.Done():
+				t.Error(err)
 				return
 			}
+			<-ctx.Done()
 		}
 	}(ctx)