diff --git a/server/core/test/testhint.c b/server/core/test/testhint.c
index 0f46e915b..e95d2bdd5 100644
--- a/server/core/test/testhint.c
+++ b/server/core/test/testhint.c
@@ -49,11 +49,13 @@ HINT    *hint;
 		char* name = strdup("name");
         hint = hint_create_parameter(NULL, name, "value");
 		free(name);
+        skygw_log_sync_all();
         ss_info_dassert(NULL != hint, "New hint list should not be null");
         ss_info_dassert(0 == strcmp("value", hint->value), "Hint value should be correct");
         ss_info_dassert(0 != hint_exists(&hint, HINT_PARAMETER), "Hint of parameter type should exist");
         ss_dfprintf(stderr, "\t..done\nFree hints.");
         if (NULL != hint) hint_free(hint);
+        skygw_log_sync_all();
         ss_dfprintf(stderr, "\t..done\n");
 		
 	return 0;
diff --git a/server/core/test/testserver.c b/server/core/test/testserver.c
index 5d4d130a8..de40847d6 100644
--- a/server/core/test/testserver.c
+++ b/server/core/test/testserver.c
@@ -48,7 +48,7 @@ char    *status;
         ss_dfprintf(stderr,
                     "testserver : creating server called MyServer"); 
         server = server_alloc("MyServer", "HTTPD", 9876);
-
+        skygw_log_sync_all();
 
         //ss_info_dassert(NULL != service, "New server with valid protocol and port must not be null");
         //ss_info_dassert(0 != service_isvalid(service), "Service must be valid after creation");
@@ -56,26 +56,32 @@ char    *status;
         ss_dfprintf(stderr, "\t..done\nTest Parameter for Server.");
         ss_info_dassert(NULL == serverGetParameter(server, "name"), "Parameter should be null when not set");
         serverAddParameter(server, "name", "value");
+        skygw_log_sync_all();
         ss_info_dassert(0 == strcmp("value", serverGetParameter(server, "name")), "Parameter should be returned correctly");
         ss_dfprintf(stderr, "\t..done\nTesting Unique Name for Server.");
         ss_info_dassert(NULL == server_find_by_unique_name("uniquename"), "Should not find non-existent unique name.");
         server_set_unique_name(server, "uniquename");
+        skygw_log_sync_all();
         ss_info_dassert(server == server_find_by_unique_name("uniquename"), "Should find by unique name.");
         ss_dfprintf(stderr, "\t..done\nTesting Status Setting for Server.");
         status = server_status(server);
+        skygw_log_sync_all();
         ss_info_dassert(0 == strcmp("Running", status), "Status of Server should be Running by default.");
         if (NULL != status) free(status);
         server_set_status(server, SERVER_MASTER);
         status = server_status(server);
+        skygw_log_sync_all();
         ss_info_dassert(0 == strcmp("Master, Running", status), "Should find correct status.");
         server_clear_status(server, SERVER_MASTER);		
 		free(status);
         status = server_status(server);
+        skygw_log_sync_all();
         ss_info_dassert(0 == strcmp("Running", status), "Status of Server should be Running after master status cleared.");
         if (NULL != status) free(status);
         ss_dfprintf(stderr, "\t..done\nRun Prints for Server and all Servers.");
         printServer(server);
         printAllServers();
+        skygw_log_sync_all();
         ss_dfprintf(stderr, "\t..done\nFreeing Server.");
         ss_info_dassert(0 != server_free(server), "Free should succeed");
         ss_dfprintf(stderr, "\t..done\n");
diff --git a/server/core/test/testusers.c b/server/core/test/testusers.c
index c2b2c9f15..2186de335 100644
--- a/server/core/test/testusers.c
+++ b/server/core/test/testusers.c
@@ -33,6 +33,8 @@
 
 #include <users.h>
 
+#include "log_manager.h"
+
 /**
  * test1	Allocate table of users and mess around with it
  *
@@ -49,26 +51,34 @@ int     result, count;
         ss_dfprintf(stderr,
                     "testusers : Initialise the user table."); 
         users = users_alloc();
+        skygw_log_sync_all();
         ss_info_dassert(NULL != users, "Allocating user table should not return NULL.")
         ss_dfprintf(stderr, "\t..done\nAdd a user");
         count = users_add(users, "username", "authorisation");
+        skygw_log_sync_all();
         ss_info_dassert(1 == count, "Should add one user");
         authdata = users_fetch(users, "username");
+        skygw_log_sync_all();
         ss_info_dassert(NULL != authdata, "Fetch valid user must not return NULL");
         ss_info_dassert(0 == strcmp("authorisation", authdata), "User authorisation should be correct");
         ss_dfprintf(stderr, "\t..done\nPrint users");
         usersPrint(users);
+        skygw_log_sync_all();
         ss_dfprintf(stderr, "\t..done\nUpdate a user");
         count = users_update(users, "username", "newauth");
+        skygw_log_sync_all();
         ss_info_dassert(1 == count, "Should update just one user");
         authdata = users_fetch(users, "username");
+        skygw_log_sync_all();
         ss_info_dassert(NULL != authdata, "Fetch valid user must not return NULL");
         ss_info_dassert(0 == strcmp("newauth", authdata), "User authorisation should be correctly updated");
         ss_dfprintf(stderr, "\t..done\nDelete a user.");
         count = users_delete(users, "username");
+        skygw_log_sync_all();
         ss_info_dassert(1 == count, "Should delete just one user");
         ss_dfprintf(stderr, "\t..done\nFree user table.");
         users_free(users);
+        skygw_log_sync_all();
         ss_dfprintf(stderr, "\t..done\n");
 		
 	return 0;