diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3adf787f..1dccc289c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ configure_file(${CMAKE_SOURCE_DIR}/server/include/version.h.in ${CMAKE_BINARY_DI
 configure_file(${CMAKE_SOURCE_DIR}/maxscale.conf.in ${CMAKE_BINARY_DIR}/maxscale.conf.prep @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/etc/init.d/maxscale.in ${CMAKE_BINARY_DIR}/etc/init.d/maxscale.prep @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/etc/ubuntu/init.d/maxscale.in ${CMAKE_BINARY_DIR}/etc/ubuntu/init.d/maxscale.prep @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.h.in ${CMAKE_BINARY_DIR}/server/include/maxscale_test.h)
 
 
 set(CMAKE_C_FLAGS "-Wall -fPIC")
diff --git a/log_manager/log_manager.h b/log_manager/log_manager.h
index af11d3a86..fa5e212f7 100644
--- a/log_manager/log_manager.h
+++ b/log_manager/log_manager.h
@@ -117,7 +117,7 @@ int  skygw_log_rotate(logfile_id_t id);
 int  skygw_log_write_flush(logfile_id_t id, const char* format, ...);
 int  skygw_log_enable(logfile_id_t id);
 int  skygw_log_disable(logfile_id_t id);
-
+void skygw_log_sync_all(void);
 
 EXTERN_C_BLOCK_END
 
diff --git a/server/core/test/testpoll.c b/server/core/test/testpoll.c
index a790e03a6..7b9175b2c 100644
--- a/server/core/test/testpoll.c
+++ b/server/core/test/testpoll.c
@@ -51,7 +51,7 @@ int     result;
                     "testpoll : Initialise the polling system."); 
         poll_init();
         ss_dfprintf(stderr, "\t..done\nAdd a DCB");
-        dcb = dcb_alloc(DCB_ROLE_SERVICE_LISTENER);
+        dcb = dcb_alloc(DCB_ROLE_REQUEST_HANDLER);
 
 		if(dcb == NULL){
 			ss_dfprintf(stderr, "\nError on function call: dcb_alloc() returned NULL.\n");
diff --git a/server/test/maxscale_test.h.in b/server/test/maxscale_test.h.in
new file mode 100644
index 000000000..7199dad79
--- /dev/null
+++ b/server/test/maxscale_test.h.in
@@ -0,0 +1,9 @@
+#ifndef MAXSCALE_TEST_H
+#define MAXSCALE_TEST_H
+#define TEST_DIR ${CMAKE_BINARY_DIR}
+#define TEST_LOG_DIR ${CMAKE_BINARY_DIR}/log
+#define TEST_BIN_DIR ${CMAKE_BINARY_DIR}/bin
+#define TEST_MOD_DIR ${CMAKE_BINARY_DIR}/modules
+#define TEST_LIB_DIR ${CMAKE_BINARY_DIR}/lib
+#define TEST_ETC_DIR ${CMAKE_BINARY_DIR}/etc
+#endif