client_test.go | 12 ++++++++++--

diff --git a/client_test.go b/client_test.go
index 89134328d7c00dad1620d4bbea71e2cc23546396..ca1cf6662c2b493e28f0ac3bdc8e0bd3245df0a0 100644
--- a/client_test.go
+++ b/client_test.go
@@ -116,6 +116,10 @@ 	if err != nil {
 		t.Fatal(err)
 	}
 	defer l.Close()
+	utpAddr, err := utp.ResolveAddr("utp", fmt.Sprintf("localhost:%d", util.AddrPort(l.Addr())))
+	if err != nil {
+		t.Fatal(err)
+	}
 	go func() {
 		for {
 			_, err := l.Accept()
@@ -125,7 +129,7 @@ 			}
 		}
 	}()
 	// Connect a UTP peer to see if the RawConn will still work.
-	utpPeer, err := utp.DialUTP("utp", nil, l.Addr().(*utp.Addr))
+	utpPeer, err := utp.DialUTP("utp", nil, utpAddr)
 	if err != nil {
 		t.Fatalf("error dialing utp listener: %s", err)
 	}
@@ -156,8 +160,12 @@ 				log.Printf("got wrong number: expected %d, got %d", i, d)
 			}
 		}
 	}()
+	udpAddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("localhost:%d", util.AddrPort(l.Addr())))
+	if err != nil {
+		t.Fatal(err)
+	}
 	for i := 0; i < N; i++ {
-		_, err := peer.WriteTo([]byte(fmt.Sprintf("%d", i)), l.Addr().(*utp.Addr).Addr)
+		_, err := peer.WriteTo([]byte(fmt.Sprintf("%d", i)), udpAddr)
 		if err != nil {
 			t.Fatal(err)
 		}