diff --git a/.travis.yml b/.travis.yml
index 7ae8b18e..52a80ec9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,15 @@ matrix:
     - os: linux
       dist: xenial
       sudo: required
+      env: BUILD_TYPE=Release UPNP=ON
+    - os: linux
+      dist: xenial
+      sudo: required
+      env: BUILD_TYPE=Release UPNP=OFF
     - os: osx
-      osx_image: xcode7.2
+      env: UPNP=yes
+    - os: osx
+      env: UPNP=no
 addons:
   apt:
     packages:
@@ -32,10 +39,6 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libressl miniupnpc ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated <package-name> || brew upgrade <package-name> ; fi
-env:
-  matrix:
-    - BUILD_TYPE=Release UPNP=ON MAKE_UPNP=yes
-    - BUILD_TYPE=Release UPNP=OFF MAKE_UPNP=no
 script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_UPNP=${UPNP} && make ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then make HOMEBREW=1 USE_UPNP=${MAKE_UPNP} ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then make HOMEBREW=1 USE_UPNP=${UPNP} ; fi