diff --git a/.travis.yml b/.travis.yml
index 6d299fc..bf2c0c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,28 +7,8 @@ services:
 before_install:
   - pip -q install -U docker-compose
 
-jobs:
-  include:
-  - stage: build
-    before_script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-    script:
-      - docker-compose -f docker/docker-compose.yml build
-      - docker push daniviga/bite
-      - docker push daniviga/ntpd
-    if: (branch = master) AND (NOT (type IN (pull_request)))
-  - stage: django
-    install:
-      - docker-compose -f docker/docker-compose.yml pull
-      - docker-compose -f docker/docker-compose.yml build
-    before_script:
-      - docker-compose -f docker/docker-compose.yml up -d
-    script:
-      - docker-compose -f docker/docker-compose.yml exec bite python manage.py test
+simulator: &simulator
   - stage: simulator
-    env: 
-      - IOT_TL=http
-      - IOT_TL=mqtt
     install:
       - docker-compose -f docker/docker-compose.yml pull
       - docker-compose -f docker/docker-compose.yml build
@@ -40,3 +20,26 @@ jobs:
       - DOCKER_HOST='127.0.0.1:22375' docker-compose -f docker/edge/docker-compose.modules.yml up -d
       - sleep 30  # collect some telemetry
       - curl -sf http://localhost/telemetry/${IOT_TL}1234/last/
+
+jobs:
+  include:
+  - stage: build
+    before_script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+    script:
+      - docker-compose -f docker/docker-compose.yml build
+      - docker push daniviga/bite
+      - docker push daniviga/ntpd
+    if: branch = master
+  - stage: django
+    install:
+      - docker-compose -f docker/docker-compose.yml pull
+      - docker-compose -f docker/docker-compose.yml build
+    before_script:
+      - docker-compose -f docker/docker-compose.yml up -d
+    script:
+      - docker-compose -f docker/docker-compose.yml exec bite python manage.py test
+  - <<: *simulator
+    env: IOT_TL=http
+  - <<: *simulator
+    env: IOT_TL=mqtt