diff --git a/test/MessageTest.cpp b/test/MessageTest.cpp
index c799dabb..2d088c9e 100644
--- a/test/MessageTest.cpp
+++ b/test/MessageTest.cpp
@@ -43,6 +43,16 @@ TEST(MessageTest, ToString) {
 	EXPECT_EQ(":irc.znc.in CMD p1", CMessage(":irc.znc.in CMD p1").ToString());
 	EXPECT_EQ(":irc.znc.in CMD p1 p2", CMessage(":irc.znc.in CMD p1 p2").ToString());
 	EXPECT_EQ(":irc.znc.in CMD :p p p", CMessage(":irc.znc.in CMD :p p p").ToString());
+
+	EXPECT_EQ("CMD", CMessage(CNick(), "CMD", {}).ToString());
+	EXPECT_EQ("CMD p1", CMessage(CNick(), "CMD", {"p1"}).ToString());
+	EXPECT_EQ("CMD p1 p2", CMessage(CNick(), "CMD", {"p1", "p2"}).ToString());
+	EXPECT_EQ("CMD :p p p", CMessage(CNick(), "CMD", {"p p p"}).ToString());
+	EXPECT_EQ(":irc.znc.in", CMessage(CNick(":irc.znc.in"), "", {}).ToString());
+	EXPECT_EQ(":irc.znc.in CMD", CMessage(CNick(":irc.znc.in"), "CMD", {}).ToString());
+	EXPECT_EQ(":irc.znc.in CMD p1", CMessage(CNick(":irc.znc.in"), "CMD", {"p1"}).ToString());
+	EXPECT_EQ(":irc.znc.in CMD p1 p2", CMessage(CNick(":irc.znc.in"), "CMD", {"p1", "p2"}).ToString());
+	EXPECT_EQ(":irc.znc.in CMD :p p p", CMessage(CNick(":irc.znc.in"), "CMD", {"p p p"}).ToString());
 }
 
 TEST(MessageTest, FormatFlags) {