diff --git a/.travis.yml b/.travis.yml
index 8c60d6b..dd5ebfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ compiler: gcc
 
 os: linux
 
-env: LLVM_HOME=$HOME/llvm BuildMode=Release+Asserts TEST_PARALLELISM=seq
+env: LLVM_HOME=$HOME/llvm BuildMode=Release+Asserts TEST_PARALLELISM=seq TEST_LOG=test.log
 
 before_script:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
diff --git a/test/Makefile b/test/Makefile
index 6fe97c6..8f397ce 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -6,6 +6,8 @@
 
 .PHONY: test lib clean
 
+TEST_LOG ?= /dev/null
+
 # The default target in this directory is the test:: target
 test:: lib
 	@ echo "Running the test cases..."
@@ -15,7 +17,7 @@ test:: lib
 	      printf "\033[37m%-20s" "$$t";\
 	  	  make clean -s -C $$t > /dev/null 2>&1;\
 		  make -s -C $$t > /dev/null 2>&1;\
-		  make test -s -C $$t DEBUGFLAGS= > /dev/null 2>&1;\
+		  make test -s -C $$t DEBUGFLAGS= >> $(TEST_LOG) 2>&1;\
 		  if [ $$? -eq 0 ]; then\
 		  	  printf "\033[34m[PASS]\033[0m\n";\
 		  else\
@@ -24,8 +26,9 @@ test:: lib
 		  fi;\
 		  make clean -s -C $$t > /dev/null 2>&1;\
 	  done;\
+	  [ "$(TEST_LOG)" != "/dev/null" ] && cat $(TEST_LOG);\
 	  exit $$RET
-	
+
 lib:
 	@ echo -n "Building the Giri..."
 	@ $(MAKE) -s -C ../build 2>&1 > /dev/null || (echo "Fail to build the Giri lib!" && exit 1)
@@ -33,3 +36,4 @@ lib:
 
 clean:
 	@ for t in $$(cat auto-tests.txt); do make clean -C $$t; done
+	@ rm -f $(TEST_LOG)