diff --git a/.travis.yml b/.travis.yml
index ed564b5..029d9d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,16 +16,6 @@ addons:
     
 script: 
   - ./travis-build.sh
-
-  - cd MQTTSNGateway
-  - make SENSORNET="xbee"
-  - make SENSORNET="udp"  
-  - make SENSORNET="udp6"
-  
-  - make test
-    
-  - cd GatewayTester
-  - make 
   
 notifications:
   emails:
diff --git a/travis-build.sh b/travis-build.sh
index 696aa53..4828211 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -9,3 +9,13 @@ echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD"
 cmake ..
 make
 ctest -VV --timeout 600
+cmake .. -DSENSORNET=xbee
+make MQTT-SNGateway
+cmake .. -DSENSORNET=udp6
+make MQTT-SNGateway
+cmake .. -DSENSORNET=loralink
+make MQTT-SNGateway
+make test
+cd MQTTSMGateway/GatewayTester
+make
+