diff --git a/irctest/server_tests/test_connection_registration.py b/irctest/server_tests/test_connection_registration.py
index 501014d..1536102 100644
--- a/irctest/server_tests/test_connection_registration.py
+++ b/irctest/server_tests/test_connection_registration.py
@@ -38,7 +38,7 @@ class PasswordedConnectionRegistrationTestCase(cases.BaseServerTestCase):
         self.assertNotEqual(m.command, '001',
                 msg='Got 001 after NICK+USER but incorrect PASS')
 
-    @cases.SpecificationSelector.requiredBySpecification('RFC1459', 'RFC2812')
+    @cases.SpecificationSelector.requiredBySpecification('RFC1459', 'RFC2812', strict=True)
     def testPassAfterNickuser(self):
         """“The password can and must be set before any attempt to register
         the connection is made.”
diff --git a/irctest/server_tests/test_messages.py b/irctest/server_tests/test_messages.py
index 4756565..dcf730e 100644
--- a/irctest/server_tests/test_messages.py
+++ b/irctest/server_tests/test_messages.py
@@ -56,7 +56,9 @@ class NoticeTestCase(cases.BaseServerTestCase):
     @cases.SpecificationSelector.requiredBySpecification('RFC1459', 'RFC2812')
     def testNoticeNonexistentChannel(self):
         """
-        'automatic replies MUST NEVER be sent in response to a NOTICE message'
+        'automatic replies MUST NEVER be sent in response to a NOTICE message.
+        This rule applies to servers too - they MUST NOT send any error repl
+        back to the client on receipt of a notice.'
         https://tools.ietf.org/html/rfc2812#section-3.3.2>
         """
         self.connectClient('foo')
diff --git a/irctest/server_tests/test_regressions.py b/irctest/server_tests/test_regressions.py
index 7559845..cc36233 100644
--- a/irctest/server_tests/test_regressions.py
+++ b/irctest/server_tests/test_regressions.py
@@ -99,7 +99,7 @@ class RegressionsTestCase(cases.BaseServerTestCase):
 
         self.sendLine(1, 'NICK valid')
         replies = {'NOTICE'}
-        while replies == {'NOTICE'}:
+        while replies <= {'NOTICE'}:
             replies = set(msg.command for msg in self.getMessages(1, synchronize=False))
         self.assertNotIn(ERR_ERRONEUSNICKNAME, replies)
         self.assertIn(RPL_WELCOME, replies)