diff --git a/integration/test_magic_folder.py b/integration/test_magic_folder.py
index 25c9794ba..4d3490c06 100644
--- a/integration/test_magic_folder.py
+++ b/integration/test_magic_folder.py
@@ -340,6 +340,7 @@ def test_edmond_uploads_then_restarts(reactor, request, temp_dir, introducer_fur
     yield edmond.transport.exited
     time.sleep(1)
     edmond = yield util._run_node(reactor, edmond.node_dir, request, 'Completed initial Magic Folder scan successfully')
+    util.await_client_ready(edmond)
 
     # add a thing to the magic-folder
     with open(join(magic_folder, "its_a_file"), "w") as f:
@@ -387,6 +388,7 @@ def test_edmond_uploads_then_restarts(reactor, request, temp_dir, introducer_fur
     yield edmond.transport.exited
     time.sleep(1)
     edmond = yield util._run_node(reactor, edmond.node_dir, request, 'Completed initial Magic Folder scan successfully')
+    util.await_client_ready(edmond)
 
     # XXX how can we say for sure if we've waited long enough? look at
     # tail of logs for magic-folder ... somethingsomething?
diff --git a/integration/test_servers_of_happiness.py b/integration/test_servers_of_happiness.py
index 1f84094e2..e5e4eb565 100644
--- a/integration/test_servers_of_happiness.py
+++ b/integration/test_servers_of_happiness.py
@@ -12,7 +12,7 @@ import pytest_twisted
 @pytest_twisted.inlineCallbacks
 def test_upload_immutable(reactor, temp_dir, introducer_furl, flog_gatherer, storage_nodes, request):
 
-    yield util._create_node(
+    edna = yield util._create_node(
         reactor, request, temp_dir, introducer_furl, flog_gatherer, "edna",
         web_port="tcp:9983:interface=localhost",
         storage=False,
@@ -20,13 +20,10 @@ def test_upload_immutable(reactor, temp_dir, introducer_furl, flog_gatherer, sto
         happy=7,
         total=10,
     )
-
+    util.await_client_ready(edna)
 
     node_dir = join(temp_dir, 'edna')
 
-    print("waiting 10 seconds unil we're maybe ready")
-    yield task.deferLater(reactor, 10, lambda: None)
-
     # upload a file, which should fail because we have don't have 7
     # storage servers (but happiness is set to 7)
     proto = util._CollectOutputProtocol()