diff --git a/.travis.yml b/.travis.yml
index 56496ea85..8a2cf9701 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: cpp
 sudo: required
 dist: trusty
+services: [docker]
 
 os:
   - linux
@@ -8,16 +9,11 @@ os:
 
 compiler:
   - gcc
-#  - clang
+  - clang
 
 git:
   depth: 3
 
-matrix:
-  include:
-    - env: BUILD=1
-      services: [docker]
-
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libmicrohttpd10 libmicrohttpd-dev libxi-dev qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev libxtst-dev xvfb;  fi
@@ -39,4 +35,4 @@ script:
 
 after_success:
   - popd
-  - if [ ! -z "$BUILD" ]; then docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'; fi
+  - "[[ $TRAVIS_BRANCH =~ (master|develop) ]] && docker run -v $(pwd):/cwd snapcore/snapcraft sh -c 'cd /cwd && apt update && snapcraft'"