diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index ed2878199..f84d69e0f 100644
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -558,6 +558,17 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
                 f.write(SYSTEM_TEST_CERTS[0])
                 f.close()
         return create_introducer(basedir=iv_dir)
+# =======
+#         iv = yield create_introducer(basedir=iv_dir)
+#         print("introducer {}".format(iv))
+#         self.introducer = self.add_service(iv)
+#         self._get_introducer_web()
+#         if use_stats_gatherer:
+#             yield self._set_up_stats_gatherer(None)
+#         yield self._set_up_nodes_2(None)
+#         if use_stats_gatherer:
+#             yield self._grab_stats(None)
+# >>>>>>> more working test
 
     def _get_introducer_web(self):
         with open(os.path.join(self.getdir("introducer"), "node.url"), "r") as f:
@@ -626,7 +637,8 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
 
         # start clients[0], wait for it's tub to be ready (at which point it
         # will have registered the helper furl).
-        c = self.add_service(client.create_client(basedirs[0]))
+        the_client = yield client.create_client(basedirs[0])
+        c = self.add_service(the_client)
         self.clients.append(c)
         c.set_default_mutable_keysize(TEST_RSA_KEY_SIZE)
 
@@ -643,7 +655,8 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
 
         # this starts the rest of the clients
         for i in range(1, self.numclients):
-            c = self.add_service(client.create_client(basedirs[i]))
+            the_client = yield client.create_client(basedirs[i])
+            c = self.add_service(the_client)
             self.clients.append(c)
             c.set_default_mutable_keysize(TEST_RSA_KEY_SIZE)
         log.msg("STARTING")
@@ -2562,6 +2575,7 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
 
 
 class Connections(SystemTestMixin, unittest.TestCase):
+
     def test_rref(self):
         self.basedir = "system/Connections/rref"
         d = self.set_up_nodes(2)