diff --git a/pkgs/racket-test-core/tests/racket/file.rktl b/pkgs/racket-test-core/tests/racket/file.rktl
index bdfbb26744..6cfac465f5 100644
--- a/pkgs/racket-test-core/tests/racket/file.rktl
+++ b/pkgs/racket-test-core/tests/racket/file.rktl
@@ -1360,6 +1360,8 @@
 
 (define (listen-port x)
   (let-values ([(la lp pa pp) (tcp-addresses x #t)])
+    (test #t exact-integer? lp)
+    (test #t equal? 0 pp)
     lp))
 
 (define (cust-test open)
@@ -1495,6 +1497,10 @@
 			[(r2 w2) (if evt?
 				     (apply values (sync (tcp-accept-evt l)))
 				     (tcp-accept l))])
+             (let-values ([(la1 lp1 pa1 pp1) (tcp-addresses r1 #t)]
+                          [(la2 lp2 pa2 pp2) (tcp-addresses r2 #t)])
+               (test #t equal? lp1 pp2)
+               (test #t equal? pp1 lp2))
 	     (test #t tcp-port? r1)
 	     (test #t tcp-port? r2)
 	     (test #t tcp-port? w1)
diff --git a/racket/src/racket/src/network.c b/racket/src/racket/src/network.c
index 63440e85cb..4fefdfa283 100644
--- a/racket/src/racket/src/network.c
+++ b/racket/src/racket/src/network.c
@@ -1381,7 +1381,7 @@ static Scheme_Object *tcp_addresses(int argc, Scheme_Object *argv[])
                      "  system error: %R");
 
   if (socket)
-    peer_names = rktio_socket_address(scheme_rktio, socket);
+    peer_names = rktio_socket_peer_address(scheme_rktio, socket);
   else
     peer_names = NULL;