diff --git a/.github/workflows/inspircd.yml b/.github/workflows/inspircd.yml
index d7dd335..7a5f8af 100644
--- a/.github/workflows/inspircd.yml
+++ b/.github/workflows/inspircd.yml
@@ -49,5 +49,6 @@ jobs:
     - name: Test with pytest
       run: |
         # testNoticeNonexistentChannel fails because of https://github.com/inspircd/inspircd/issues/1849
-        PATH=~/.local/bin:$PATH pytest --controller irctest.controllers.inspircd -k 'not Oragono and not deprecated and not strict and not testNoticeNonexistentChannel'
+        # testDirectMessageEcho fails because of https://github.com/inspircd/inspircd/issues/1851
+        PATH=~/.local/bin:$PATH pytest --controller irctest.controllers.inspircd -k 'not Oragono and not deprecated and not strict and not testNoticeNonexistentChannel and not testDirectMessageEcho'
 
diff --git a/irctest/controllers/inspircd.py b/irctest/controllers/inspircd.py
index 1ff5e87..db458f8 100644
--- a/irctest/controllers/inspircd.py
+++ b/irctest/controllers/inspircd.py
@@ -12,11 +12,19 @@ TEMPLATE_CONFIG = """
 {ssl_config}
 <module name="cap">
 <module name="ircv3">
+<module name="ircv3_batch">
 <module name="ircv3_capnotify">
+<module name="ircv3_ctctags">
 <module name="ircv3_echomessage">
+<module name="ircv3_invitenotify">
+<module name="ircv3_labeledresponse">
+<module name="ircv3_msgid">
+<module name="ircv3_servertime">
+<module name="monitor">
 <module name="namesx"> # For multi-prefix
 <connect allow="*"
     resolvehostnames="no" # Faster
+    recvq="40960" # Needs to be larger than a valid message with tags
     {password_field}>
 <log method="file" type="*" level="debug" target="/tmp/ircd-{port}.log">
 """
diff --git a/irctest/server_tests/test_echo_message.py b/irctest/server_tests/test_echo_message.py
index 20ed113..9e73dfc 100644
--- a/irctest/server_tests/test_echo_message.py
+++ b/irctest/server_tests/test_echo_message.py
@@ -48,8 +48,15 @@ class DMEchoMessageTestCase(cases.BaseServerTestCase):
 
         self.assertEqual(delivery.params, [qux, "hi there"])
         self.assertEqual(delivery.params, echo.params)
-        self.assertEqual(delivery.tags["msgid"], echo.tags["msgid"])
-        self.assertEqual(echo.tags["label"], "xyz")
+
+        # Either both messages have a msgid, or neither does
+        self.assertEqual(delivery.tags.get("msgid"), echo.tags.get("msgid"))
+
+        self.assertEqual(
+            echo.tags.get("label"),
+            "xyz",
+            fail_msg="expected message label 'xyz', but got {got!r}",
+        )
         self.assertEqual(delivery.tags["+example-client-tag"], "example-value")
         self.assertEqual(
             delivery.tags["+example-client-tag"], echo.tags["+example-client-tag"]