diff --git a/src/tests/localbuddy.cpp b/src/tests/localbuddy.cpp
index fdc6fb87378a67f0e9456acd9c66c84698e38565..3a0ee7951b1db940ae0af601b4659cb4437f0504 100644
--- a/src/tests/localbuddy.cpp
+++ b/src/tests/localbuddy.cpp
@@ -25,6 +25,7 @@ class LocalBuddyTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST(createWithInvalidName);
 	CPPUNIT_TEST(buddyFlagsFromJID);
 	CPPUNIT_TEST(JIDToLegacyName);
+	CPPUNIT_TEST(getSafeName);
 	CPPUNIT_TEST(handleBuddyChanged);
 	CPPUNIT_TEST(setAlias);
 	CPPUNIT_TEST_SUITE_END();
@@ -70,6 +71,20 @@ class LocalBuddyTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 		CPPUNIT_ASSERT_EQUAL(std::string("hanzz@test"), Buddy::JIDToLegacyName("hanzz%test@localhost/bot"));
 	}
 
+	void getSafeName() {
+		User *user = userManager->getUser("user@localhost");
+		CPPUNIT_ASSERT(user);
+
+		std::vector<std::string> grp;
+		grp.push_back("group1");
+		LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1@test", "Buddy 1", grp, BUDDY_JID_ESCAPING);
+
+		CPPUNIT_ASSERT_EQUAL(std::string("buddy1\\40test"), buddy->getSafeName());
+
+		buddy->setFlags(BUDDY_NO_FLAG);
+		CPPUNIT_ASSERT_EQUAL(std::string("buddy1%test"), buddy->getSafeName());
+	}
+
 	void buddyFlagsFromJID() {
 		CPPUNIT_ASSERT_EQUAL(BUDDY_JID_ESCAPING, Buddy::buddyFlagsFromJID("hanzz\\40test@localhost/bot"));
 		CPPUNIT_ASSERT_EQUAL(BUDDY_NO_FLAG, Buddy::buddyFlagsFromJID("hanzz%test@localhost/bot"));