diff --git a/tests/libtransport/user.cpp b/tests/libtransport/user.cpp
index 714ac48e988cad4306484c389873c645bdb600c4..6180c8d03697d7ca5219fd4d5b70e11729f4e985 100644
--- a/tests/libtransport/user.cpp
+++ b/tests/libtransport/user.cpp
@@ -13,7 +13,7 @@
 using namespace Transport;
 
 #if !HAVE_SWIFTEN_3
-#define value_or(X) substr()
+#define get_value_or(X) substr()
 #endif
 
 class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
@@ -431,7 +431,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 
 		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
 		Swift::Message *m = dynamic_cast<Swift::Message *>(getStanza(received[0]));
-		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), m->getBody().value_or(""));
+		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), m->getBody().get_value_or(""));
 
 		CPPUNIT_ASSERT(dynamic_cast<Swift::StreamError *>(received[1].get()));
 		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), dynamic_cast<Swift::StreamError *>(received[1].get())->getText());