diff --git a/tests/libtransport/usermanager.cpp b/tests/libtransport/usermanager.cpp
index eb9130cc87ea4869aca343f7ceffb3af937fae29..4f2829c2b479eb880929554b4e85108ff8887d15 100644
--- a/tests/libtransport/usermanager.cpp
+++ b/tests/libtransport/usermanager.cpp
@@ -12,6 +12,10 @@
 
 using namespace Transport;
 
+#if !HAVE_SWIFTEN_3
+#define value_or(X) substr()
+#endif
+
 class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(UserManagerTest);
 	CPPUNIT_TEST(connectUser);
@@ -77,7 +81,7 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 
 		CPPUNIT_ASSERT_EQUAL(3, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
-		CPPUNIT_ASSERT_EQUAL(std::string("Ahoj"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody());
+		CPPUNIT_ASSERT_EQUAL(std::string("Ahoj"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().value_or(""));
 		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getTo().toString());
 		CPPUNIT_ASSERT_EQUAL(std::string("localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getFrom().toString());