diff --git a/packer/rpc/mux_broker_test.go b/packer/rpc/mux_broker_test.go
index 88739a0ff..53f398e53 100644
--- a/packer/rpc/mux_broker_test.go
+++ b/packer/rpc/mux_broker_test.go
@@ -17,15 +17,20 @@ func TestMuxBroker(t *testing.T) {
 	go bc.Run()
 	go bs.Run()
 
+	errChan := make(chan error, 1)
 	go func() {
 		c, err := bc.Dial(5)
 		if err != nil {
-			t.Fatalf("err: %s", err)
+			errChan <- fmt.Errorf("err dialing: %s", err)
+			close(errChan)
+			return
 		}
 
 		if _, err := c.Write([]byte{42}); err != nil {
-			t.Fatalf("err: %s", err)
+			errChan <- fmt.Errorf("err writing: %s", err)
 		}
+
+		close(errChan)
 	}()
 
 	client, err := bs.Accept(5)
@@ -41,6 +46,15 @@ func TestMuxBroker(t *testing.T) {
 	if data[0] != 42 {
 		t.Fatalf("bad: %d", data[0])
 	}
+
+	for {
+		err, open := <-errChan
+		if !open {
+			if err != nil {
+				t.Fatalf(err)
+			}
+		}
+	}
 }
 
 func testYamux(t *testing.T) (client *yamux.Session, server *yamux.Session) {