diff --git a/.travis.yml b/.travis.yml
index 77b789cc..b4c1849f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,20 +6,20 @@ compiler:
 
 jobs:
   include:
-    - os: linux
+    - stage: lint 
+      os: linux
       compiler: clang
       script: scan-build --status-bugs -analyze-headers -v make -j2
-    - os: linux
-      compiler: gcc
-      script: make
-    - stage: lint
-      name: "Pretty Check"
+    - stage: demos-build
       os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-xenial-6.0
-            - ubuntu-toolchain-r-test
-          packages:
-            - clang-format-6.0
-      script: make pretty-check
+      compiler: gcc
+      script: make clean all
+    - stage: gateway-build
+      os: linux
+      compiler: gcc
+      script: make clean gateway
+    - stage: unit-tests
+      os: linux
+      compiler: gcc
+      script: make clean test
+
diff --git a/Makefile b/Makefile
index f5178fd9..55e0188c 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ CFLAGS  = $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DE
 .EXPORT_ALL_VARIABLES:
 
 all: library demos router-ipv6 ${DEMO_LINUX}
-.PHONY : all library demos router gateway router-ipv6 clean
+.PHONY : all library demos router gateway router-ipv6 clean test
 
 library:
 	$(MAKE) -s -C lib all
@@ -130,5 +130,10 @@ clean:
 	$(MAKE) -s -C demo/gateway clean
 
 test:
-	$(MAKE)make -s -C test clean all report
-	$(MAKE)make -s -C demo/objects clean all report
+	$(MAKE) -s -C test clean
+	$(MAKE) -s -C test all
+	$(MAKE) -s -C test report
+	$(MAKE) -s -C demo/objects clean
+	$(MAKE) -s -C demo/objects all
+	$(MAKE) -s -C demo/objects report
+