diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index be889317d5..a0492d6aab 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -129,8 +129,8 @@ class TestGeneral(CommandTest):
 
     def test_nick(self):
         self.call(general.CmdNick(), "testalias = testaliasedstring1", "Inputline-nick 'testalias' mapped to 'testaliasedstring1'.")
-        self.call(general.CmdNick(), "/account testalias = testaliasedstring2", "Accountnick 'testalias' mapped to 'testaliasedstring2'.")
-        self.call(general.CmdNick(), "/object testalias = testaliasedstring3", "Objectnick 'testalias' mapped to 'testaliasedstring3'.")
+        self.call(general.CmdNick(), "/account testalias = testaliasedstring2", "Account-nick 'testalias' mapped to 'testaliasedstring2'.")
+        self.call(general.CmdNick(), "/object testalias = testaliasedstring3", "Object-nick 'testalias' mapped to 'testaliasedstring3'.")
         self.assertEqual(u"testaliasedstring1", self.char1.nicks.get("testalias"))
         self.assertEqual(None, self.char1.nicks.get("testalias", category="account"))
         self.assertEqual(u"testaliasedstring2", self.char1.account.nicks.get("testalias", category="account"))
diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 3ba56d3410..78ecc0f4fb 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -689,7 +689,7 @@ class TestMail(CommandTest):
         self.call(mail.CmdMail(), "TestAccount=Message 1", "You sent your message.", caller=self.account2)
         self.call(mail.CmdMail(), "TestAccount=Message 2", "You sent your message.", caller=self.account2)
         self.call(mail.CmdMail(), "", "------------------------------------------------------------------------------| ID:   From:            Subject:", caller=self.account)
-        self.call(mail.CmdMail(), "2", "From: TestAccount2", caller=self.account)
+        self.call(mail.CmdMail(), "2", "------------------------------------------------------------------------------\nFrom: TestAccount2", caller=self.account)
         self.call(mail.CmdMail(), "/forward TestAccount2 = 1/Forward message", "You sent your message.|Message forwarded.", caller=self.account)
         self.call(mail.CmdMail(), "/reply 2=Reply Message2", "You sent your message.", caller=self.account)
         self.call(mail.CmdMail(), "/delete 2", "Message 2 deleted", caller=self.account)