diff --git a/log_manager/test/makefile b/log_manager/test/makefile
index 6d37c7197..75df90c60 100644
--- a/log_manager/test/makefile
+++ b/log_manager/test/makefile
@@ -5,6 +5,7 @@
 
 include ../../build_gateway.inc
 include ../../makefile.inc
+include ../../test.inc
 
 CC = gcc
 CPP = g++
@@ -43,7 +44,7 @@ buildtests:
 
 
 runtests: 
-	@echo ""				>> $(TESTLOG)
+	@echo ""				>  $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test Log Manager"		>> $(TESTLOG)
@@ -62,3 +63,5 @@ runtests:
 	@-$(LAUNCH_DEBUGGER) $(TESTAPP) "-t 16"	2>>$(TESTLOG)
 	@echo "Log Manager PASSED"		>> $(TESTLOG)
 	@echo ""				>> $(TESTLOG)
+
+#	@cat $(TESTLOG)				>> $(TEST_MAXSCALE_LOG)
diff --git a/query_classifier/test/makefile b/query_classifier/test/makefile
index 4ad30a16c..9e35c8b0e 100644
--- a/query_classifier/test/makefile
+++ b/query_classifier/test/makefile
@@ -5,6 +5,7 @@
 
 include ../../build_gateway.inc
 include ../../makefile.inc
+include ../../test.inc
 
 CC = gcc
 CPP = g++
@@ -48,7 +49,7 @@ buildtests:
 	$(LDLIBS) $(LDMYSQL) 
 
 runtests:
-	@echo ""				>> $(TESTLOG)
+	@echo ""				>  $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test Query Classifier"		>> $(TESTLOG)
@@ -59,3 +60,4 @@ ifeq ($?, 0)
 else
 	@echo "Query Classifier FAILED"	>> $(TESTLOG)
 endif
+	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)
\ No newline at end of file
diff --git a/server/core/test/makefile b/server/core/test/makefile
index d0008b1ce..d3948575d 100644
--- a/server/core/test/makefile
+++ b/server/core/test/makefile
@@ -5,6 +5,7 @@
 
 include ../../../build_gateway.inc
 include ../../../makefile.inc
+include ../../../test.inc
 
 CC=cc
 TESTLOG := $(shell pwd)/testhash.log
@@ -26,7 +27,7 @@ buildtests :
 	testhash.c ../hashtable.o ../atomic.o ../spinlock.o -o testhash
 
 runtests:
-	@echo ""				>> $(TESTLOG)
+	@echo ""				>  $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test MaxScale core"		>> $(TESTLOG)
@@ -38,3 +39,4 @@ else
 	@echo "MaxScale core FAILED" 		>> $(TESTLOG)
 endif
 	@echo ""				>> $(TESTLOG)
+	@cat $(TESTLOG)				>> $(TEST_MAXSCALE_LOG)
\ No newline at end of file
diff --git a/server/modules/routing/readwritesplit/test/makefile b/server/modules/routing/readwritesplit/test/makefile
index 4cfbe7214..87d22363d 100644
--- a/server/modules/routing/readwritesplit/test/makefile
+++ b/server/modules/routing/readwritesplit/test/makefile
@@ -8,7 +8,7 @@ include $(ROOT_PATH)/makefile.inc
 include $(ROOT_PATH)/test.inc
 
 CC=cc
-TESTLOG := $(shell pwd)/testrouters.log
+TESTLOG := $(shell pwd)/testrwsplit.log
 RET := -1
 
 cleantests:
@@ -25,12 +25,11 @@ buildtests:
 
 
 runtests:
-	@echo ""				>> $(TESTLOG)
+	@echo ""				>  $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test Read/Write split router"	>> $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	./rwsplit.sh $(TESTLOG) $(THOST) $(TPORT_RW) $(TMASTER_ID) $(TUSER) $(TPWD) 
 	@echo ""                        >> $(TESTLOG)
-
-	
\ No newline at end of file
+	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)
\ No newline at end of file
diff --git a/server/test/makefile b/server/test/makefile
index 5bab4a666..d812494fc 100644
--- a/server/test/makefile
+++ b/server/test/makefile
@@ -5,6 +5,7 @@
 
 include ../../build_gateway.inc
 include ../../makefile.inc
+include ../../test.inc
 
 TEST_ROOT	:= $(ROOT_PATH)/test
 PARENT_DIR	:= $(ROOT_PATH)/server
@@ -58,7 +59,7 @@ else
 endif
 
 runtests: 
-	@echo ""				>> $(TESTLOG)
+	@echo ""				>  $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test MaxScale server"		>> $(TESTLOG)
@@ -70,4 +71,4 @@ runtests:
 	@sleep 5
 	@echo "MaxScale server PASSED"	>> $(TESTLOG)
 	@echo ""			>> $(TESTLOG)
-
+	@cat $(TESTLOG)			>> $(TEST_MAXSCALE_LOG)
diff --git a/test.inc b/test.inc
index 241772b0b..b020368d8 100644
--- a/test.inc
+++ b/test.inc
@@ -32,4 +32,10 @@ TPWD            :=
 # master's server_id, for example:
 # TMASTER_ID    := 2
 #
-TMASTER_ID      :=
\ No newline at end of file
+TMASTER_ID      := 
+
+#
+# Global test log where all log is gathered
+# TEST_MAXSCALE_LOG   := $(ROOT_PATH)/test/test_maxscale.log
+#
+TEST_MAXSCALE_LOG   := 
diff --git a/test/makefile b/test/makefile
index 7a0a19bc9..15e57f8bf 100644
--- a/test/makefile
+++ b/test/makefile
@@ -5,11 +5,12 @@
 
 include ../build_gateway.inc
 include ../makefile.inc
+include ../test.inc
 
 export MAXSCALE_HOME=$(shell pwd)/MaxScale
 
 CC=cc
-TESTLOG := $(shell pwd)/testmaxscale.log
+TESTLOG := $(TEST_MAXSCALE_LOG)
 
 testall:
 	$(MAKE) cleantests
@@ -55,9 +56,10 @@ buildtests:
 	$(MAKE) -C $(ROOT_PATH)/utils				buildtests
 
 runtests:
-	@echo ""			>> $(TESTLOG)
+	@echo ""			> $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo $(shell date)			>> $(TESTLOG)
 	@echo "Test MaxScale root"		>> $(TESTLOG)
 	@echo "-------------------------------"	>> $(TESTLOG)
 	@echo "Nothing to run here so far"	>> $(TESTLOG)
+	
\ No newline at end of file