diff --git a/test-suite/tests/00-repl-server.test b/test-suite/tests/00-repl-server.test
index 4b5ec0cb3..0b4d0c6b0 100644
--- a/test-suite/tests/00-repl-server.test
+++ b/test-suite/tests/00-repl-server.test
@@ -62,7 +62,7 @@ socket connected to that server."
                  (connect client-socket sockaddr))
                (lambda args
                  (when (memv (system-error-errno args)
-                             (list ENOENT ECONNREFUSED))
+                             (list ENOENT ECONNREFUSED ENOTCONN))
                    (when (> tries 30)
                      (throw 'unresolved))
                    (usleep 100)
@@ -139,7 +139,7 @@ reached."
                   (loop (+ 1 n))))))
         (lambda args
           (->bool (memv (system-error-errno args)
-                        (list ECONNRESET EPIPE))))))))
+                        (list ECONNRESET EPIPE ENOTCONN))))))))
 
 ;;; Local Variables:
 ;;; eval: (put 'with-repl-server 'scheme-indent-function 1)