diff --git a/integration/test_i2p.py b/integration/test_i2p.py
index e87ba28e2..3f2133f6f 100644
--- a/integration/test_i2p.py
+++ b/integration/test_i2p.py
@@ -56,7 +56,6 @@ def i2p_network(reactor, temp_dir, request):
             "--reseed.urls", "http://localhost:1/",
         ),
     )
-    pytest_twisted.blockon(proto.magic_seen)
 
     def cleanup():
         try:
@@ -66,6 +65,8 @@ def i2p_network(reactor, temp_dir, request):
             pass
     request.addfinalizer(cleanup)
 
+    util.block_with_timeout(proto.magic_seen, reactor, timeout=30)
+
 
 @pytest.fixture(scope='session')
 @log_call(