diff --git a/.travis.yml b/.travis.yml
index 150acdc3..355180a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,8 +110,8 @@ jobs:
         - ./travis.py erpnext --nginx --git-version 11
         - ./travis.py erpnext --nginx --tag v11 --tag-only
         - ./travis.py erpnext --nginx --tag version-11 --tag-only
-    - stage: "Build and test develop branch"
-      if: type = pull_request OR branch = develop
+    - stage: "Build and test edge images"
+      if: type = pull_request
       before_install:
         - sudo apt-get update && sudo apt-get -y install docker-compose
       script:
@@ -121,3 +121,9 @@ jobs:
         - docker build -t frappe/frappe-nginx:develop -f build/frappe-nginx/Dockerfile .
         - docker build -t frappe/erpnext-nginx:edge -f build/erpnext-nginx/Dockerfile .
         - ./tests/docker-test.sh
+    - stage: "Pull and test edge images"
+      if: branch = develop AND type != pull_request
+      before_install:
+        - sudo apt-get update && sudo apt-get -y install docker-compose
+      script:
+        - ./tests/docker-test.sh