diff --git a/irctest/cases.py b/irctest/cases.py
index 600d27b..a5924d4 100644
--- a/irctest/cases.py
+++ b/irctest/cases.py
@@ -378,7 +378,7 @@ class BaseServerTestCase(_IrcTestCase):
         # wait until we see them join the channel
         joined = False
         while not joined:
-            for msg in self.getMessages(1):
+            for msg in self.getMessages(client):
                 # todo: also respond to cannot join channel numeric
                 if msg.command.upper() == 'JOIN' and 0 < len(msg.params) and msg.params[0].lower() == channel.lower():
                     joined = True
diff --git a/irctest/server_tests/test_extended_join.py b/irctest/server_tests/test_extended_join.py
index 12cb876..6e3e8fa 100644
--- a/irctest/server_tests/test_extended_join.py
+++ b/irctest/server_tests/test_extended_join.py
@@ -48,8 +48,8 @@ class MetadataTestCase(cases.BaseServerTestCase, cases.OptionalityHelper):
 
         self.controller.registerUser(self, 'jilles', 'sesame')
         self.connectRegisteredClient('bar')
+        self.joinChannel(2, '#chan')
 
-        self.sendLine(2, 'JOIN #chan')
         m = self.getMessage(1)
         self.assertMessageEqual(m, command='JOIN',
                 params=['#chan', 'jilles', 'Realname'],