diff --git a/wai/wai-rs/tests/fixtures/dev-stack/fake-stack.py b/wai/wai-rs/tests/fixtures/dev-stack/fake-stack.py
index cce944f03..f8c7a71e4 100755
--- a/wai/wai-rs/tests/fixtures/dev-stack/fake-stack.py
+++ b/wai/wai-rs/tests/fixtures/dev-stack/fake-stack.py
@@ -15,6 +15,7 @@ import json
 import os
 import re
 import socket
+import socketserver
 import sys
 import threading
 import time
@@ -55,6 +56,14 @@ class Room(http.server.BaseHTTPRequestHandler):
         pass
 
 
+class Server(http.server.ThreadingHTTPServer):
+    """HTTPServer looks up a name for its address before it listens, and nothing here reads the
+    name. On some hosts that lookup takes 35 s, past what `wai dev` waits for a service."""
+
+    def server_bind(self):
+        socketserver.TCPServer.server_bind(self)
+
+
 def main(argv):
     if argv[:1] in (["keygen"], ["relay-lines"]):
         open(argv[1], "a").close()
@@ -73,7 +82,7 @@ def main(argv):
         while True:
             c, _ = s.accept()
             c.close()
-    http.server.ThreadingHTTPServer(listen_addr(config, "listen"), Room).serve_forever()
+    Server(listen_addr(config, "listen"), Room).serve_forever()
     return 0