diff --git a/src/allmydata/test/common_system.py b/src/allmydata/test/common_system.py
index a6b239005..ca2904b53 100644
--- a/src/allmydata/test/common_system.py
+++ b/src/allmydata/test/common_system.py
@@ -655,7 +655,7 @@ async def spin_until_cleanup_done(value=None, timeout=10):
         else:
             # Normal reactor
             return len([r for r in reactor.getReaders()
-                        if r.__class__.__name__ not in ("_UnixWaker", "_SIGCHLDWaker")]
+                        if r.__class__.__name__ not in ("_UnixWaker", "_SIGCHLDWaker", "_SocketWaker")]
                        ) + len(reactor.getWriters())
 
     for i in range(timeout * 1000):