diff --git a/test/test_adapter_cxx.cc b/test/test_adapter_cxx.cc
index 758c894..bf620c3 100644
--- a/test/test_adapter_cxx.cc
+++ b/test/test_adapter_cxx.cc
@@ -2,6 +2,7 @@
 // see LICENSE.txt
 
 #include "framework/framework.hh"
+#include "framework/utils.hh"
 #include <iostream>
 #include <assert.h>
 #include <unistd.h>
@@ -10,19 +11,18 @@
 #include <pEp/sync_api.h>
 
 #include "../src/Adapter.hh"
-#include "../src/pEpLog.hh"
 
 using namespace pEp;
 
 PEP_STATUS messageToSend(struct _message *msg)
 {
-    pEpLog("called");
+    TESTLOG("called");
     return PEP_STATUS_OK;
 }
 
 PEP_STATUS notifyHandshake(pEp_identity *me, pEp_identity *partner, ::sync_handshake_signal signal)
 {
-    pEpLog("called");
+    TESTLOG("called");
     return PEP_STATUS_OK;
 }
 
@@ -30,12 +30,12 @@ class JNISync {
 public:
     void onSyncStartup()
     {
-        pEpLog("called");
+        TESTLOG("called");
     }
 
     void onSyncShutdown()
     {
-        pEpLog("called");
+        TESTLOG("called");
     }
 } o;
 
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
     pEp::Test::setup(argc, argv);
 
     // Create new identity
-    pEpLog("updating or creating identity for me");
+    TESTLOG("updating or creating identity for me");
     ::pEp_identity *me = ::new_identity("alice@peptest.ch", NULL, "23", "Who the F* is Alice");
     assert(me);
     ::PEP_STATUS status = ::myself(Adapter::session(), me);
@@ -55,17 +55,17 @@ int main(int argc, char **argv)
     useconds_t sleepuSec = 1000 * 100;
     unsigned long long int nrIters = 1000 * 1000 * 1000;
     for (int i = 0; i < nrIters; i++) {
-        pEpLog("RUN NR: ");
-        pEpLog(i);
-        pEpLog("SYNC START");
-        pEpLog("starting the adapter including sync");
+        TESTLOG("RUN NR: ");
+        TESTLOG(i);
+        TESTLOG("SYNC START");
+        TESTLOG("starting the adapter including sync");
         Adapter::startup<JNISync>(
             messageToSend,
             notifyHandshake,
             &o,
             &JNISync::onSyncStartup,
             &JNISync::onSyncShutdown);
-        pEpLog("SYNC STOP");
+        TESTLOG("SYNC STOP");
         usleep(sleepuSec);
         Adapter::shutdown();
     }