diff --git a/.travis.yml b/.travis.yml
index 775f6902..a980d079 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,19 @@
 language: c
 
-compiler:
-  - clang
-  - gcc
-
 jobs:
-  include:
-    - stage: demos-build
-      os: linux
-      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
-    - stage: lint 
-      os: linux
-      compiler: clang
-      script: scan-build --status-bugs -analyze-headers -v make -j2 clean server
-
+  - stage: demos-build
+    os: linux
+    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
+  - stage: lint
+    os: linux
+    compiler: clang
+    script: scan-build --status-bugs -analyze-headers -v make -j2 clean server