diff --git a/test-suite/tests/00-socket.test b/test-suite/tests/00-socket.test
index d3a4f9fbd..cfe92682f 100644
--- a/test-suite/tests/00-socket.test
+++ b/test-suite/tests/00-socket.test
@@ -288,8 +288,7 @@
                (set! server-listening? #t)
                #t)))
 
-       (force-output (current-output-port))
-       (force-output (current-error-port))
+       (flush-all-ports)
        (when server-listening?
           (let ((pid (primitive-fork-if-available)))
            ;; Spawn a server process.
@@ -368,8 +367,7 @@
                (set! server-listening? #t)
                #t)))
 
-       (force-output (current-output-port))
-       (force-output (current-error-port))
+       (flush-all-ports)
        (when server-listening?
           (let ((pid (primitive-fork-if-available)))
            ;; Spawn a server process.
@@ -440,8 +438,7 @@
                 (set! server-listening? #t)
                 #t)))
 
-        (force-output (current-output-port))
-        (force-output (current-error-port))
+       (flush-all-ports)
         (if server-listening?
             (let ((pid (primitive-fork-if-available)))
               ;; Spawn a server process.
@@ -539,8 +536,7 @@
                (set! server-listening? #t)
                #t)))
 
-       (force-output (current-output-port))
-       (force-output (current-error-port))
+       (flush-all-ports)
        (if server-listening?
             (let ((pid (primitive-fork-if-available)))
              ;; Spawn a server process.