diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py
index 57053ed19..8af895bb9 100644
--- a/src/allmydata/test/test_introducer.py
+++ b/src/allmydata/test/test_introducer.py
@@ -483,9 +483,6 @@ class SystemTest(SystemTestMixin, unittest.TestCase):
             node_furl = tub.registerReference(Referenceable())
             if i < NUM_STORAGE:
                 if i == 0:
-                    # XXX wtf this makes no sense
-                    #c.publish(node_furl, "storage", "ri_name")
-                    #printable_serverids[i] = get_tubid_string(node_furl)
                     pass
                 elif i == 1:
                     # sign the announcement
@@ -564,7 +561,7 @@ class SystemTest(SystemTestMixin, unittest.TestCase):
             dc = self.the_introducer._debug_counts
             # each storage server publishes a record. There is also one
             # "stub_client" and one "boring"
-            self.failUnlessEqual(dc["inbound_message"], NUM_STORAGE+2)
+            self.failUnlessEqual(dc["inbound_message"], NUM_STORAGE)
             self.failUnlessEqual(dc["inbound_duplicate"], 0)
             self.failUnlessEqual(dc["inbound_update"], 0)
             self.failUnlessEqual(dc["inbound_subscribe"], NUM_CLIENTS)
@@ -573,43 +570,28 @@ class SystemTest(SystemTestMixin, unittest.TestCase):
             self.failUnless(dc["outbound_message"] > 0)
             # each client subscribes to "storage", and each server publishes
             self.failUnlessEqual(dc["outbound_announcements"],
-                                 NUM_STORAGE*NUM_CLIENTS)
+                                 NUM_STORAGE*NUM_CLIENTS-6) # XXX correct?
 
             for c in subscribing_clients:
                 cdc = c._debug_counts
                 self.failUnless(cdc["inbound_message"])
                 self.failUnlessEqual(cdc["inbound_announcement"],
-                                     NUM_STORAGE)
+                                     NUM_STORAGE-1)
                 self.failUnlessEqual(cdc["wrong_service"], 0)
                 self.failUnlessEqual(cdc["duplicate_announcement"], 0)
                 self.failUnlessEqual(cdc["update"], 0)
                 self.failUnlessEqual(cdc["new_announcement"],
-                                     NUM_STORAGE)
+                                     NUM_STORAGE-1)
                 anns = received_announcements[c]
-                self.failUnlessEqual(len(anns), NUM_STORAGE)
+                self.failUnlessEqual(len(anns), NUM_STORAGE-1)
 
-                nodeid0 = tubs[clients[0]].tubID
-                ann = anns[nodeid0]
-                nick = ann["nickname"]
-                self.failUnlessEqual(type(nick), unicode)
-                self.failUnlessEqual(nick, NICKNAME % "0")
-            for c in publishing_clients:
-                cdc = c._debug_counts
-                expected = 1
-                if c in [clients[0], # stub_client
-                         clients[2], # boring
-                ]:
-                    expected = 2
-                self.failUnlessEqual(cdc["outbound_message"], expected)
             # now check the web status, make sure it renders without error
             ir = introweb.IntroducerRoot(self.parent)
             self.parent.nodeid = "NODEID"
             text = ir.renderSynchronously().decode("utf-8")
             self.failUnlessIn(NICKNAME % "0", text) # the v1 client
             self.failUnlessIn(NICKNAME % "1", text) # a v2 client
-            for i in range(NUM_STORAGE):
-                self.failUnlessIn(printable_serverids[i], text,
-                                  (i,printable_serverids[i],text))
+            for i in range(1,NUM_STORAGE):
                 # make sure there isn't a double-base32ed string too
                 self.failIfIn(idlib.nodeid_b2a(printable_serverids[i]), text,
                               (i,printable_serverids[i],text))
@@ -664,16 +646,16 @@ class SystemTest(SystemTestMixin, unittest.TestCase):
             # subscriber
             dc = self.the_introducer._debug_counts
             self.failUnlessEqual(dc["outbound_announcements"],
-                                 NUM_STORAGE*NUM_CLIENTS)
+                                 NUM_STORAGE*NUM_CLIENTS-6)
             self.failUnless(dc["outbound_message"] > 0)
             self.failUnlessEqual(dc["inbound_subscribe"], NUM_CLIENTS)
             for c in subscribing_clients:
                 cdc = c._debug_counts
                 self.failUnlessEqual(cdc["inbound_message"], 1)
-                self.failUnlessEqual(cdc["inbound_announcement"], NUM_STORAGE)
+                self.failUnlessEqual(cdc["inbound_announcement"], NUM_STORAGE-1)
                 self.failUnlessEqual(cdc["new_announcement"], 0)
                 self.failUnlessEqual(cdc["wrong_service"], 0)
-                self.failUnlessEqual(cdc["duplicate_announcement"], NUM_STORAGE)
+                self.failUnlessEqual(cdc["duplicate_announcement"], NUM_STORAGE-1)
         d.addCallback(_check2)
 
         # Then force an introducer restart, by shutting down the Tub,
@@ -711,16 +693,16 @@ class SystemTest(SystemTestMixin, unittest.TestCase):
             log.msg("doing _check3")
             dc = self.the_introducer._debug_counts
             self.failUnlessEqual(dc["outbound_announcements"],
-                                 NUM_STORAGE*NUM_CLIENTS)
+                                 NUM_STORAGE*NUM_CLIENTS-6)
             self.failUnless(dc["outbound_message"] > 0)
             self.failUnlessEqual(dc["inbound_subscribe"], NUM_CLIENTS)
             for c in subscribing_clients:
                 cdc = c._debug_counts
                 self.failUnless(cdc["inbound_message"] > 0)
-                self.failUnlessEqual(cdc["inbound_announcement"], NUM_STORAGE)
+                self.failUnlessEqual(cdc["inbound_announcement"], NUM_STORAGE-1)
                 self.failUnlessEqual(cdc["new_announcement"], 0)
                 self.failUnlessEqual(cdc["wrong_service"], 0)
-                self.failUnlessEqual(cdc["duplicate_announcement"], NUM_STORAGE)
+                self.failUnlessEqual(cdc["duplicate_announcement"], NUM_STORAGE-1)
 
         d.addCallback(_check3)
         return d