diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
index 65e176620d..2a1e904f3b 100644
--- a/tests/user_commands/tests.py
+++ b/tests/user_commands/tests.py
@@ -400,8 +400,8 @@ class CommandTests(SimpleTestCase):
         self.assertIn("bar", out.getvalue())
 
     def test_subparser_invalid_option(self):
-        msg = "invalid choice: 'test' (choose from 'foo')"
-        with self.assertRaisesMessage(CommandError, msg):
+        msg = r"invalid choice: 'test' \(choose from '?foo'?\)"
+        with self.assertRaisesRegex(CommandError, msg):
             management.call_command("subparser", "test", 12)
         msg = "Error: the following arguments are required: subcommand"
         with self.assertRaisesMessage(CommandError, msg):