diff --git a/.travis.yml b/.travis.yml
index 5a718362..1394b1ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,13 @@
 sudo: required
 language: c
-compiler:
-- gcc
-- clang
-os:
-- linux
-- osx
-matrix:
-  exclude:
-  - compiler: gcc
-    os: osx
-  - compiler: clang
-    os: linux
+jobs:
+  include:
+    - os: linux
+      compiler: gcc
+      env: OPENSSL_ROOT_DIR=
+    - os: osx
+      compiler: clang
+      env: OPENSSL_ROOT_DIR=/usr/local/opt/openssl
 before_install:
 #- if [ "$DEPLOY" = "true" ]; then ./travis-setup-deploy.sh; fi
 - "./travis-install.sh"
diff --git a/travis-build.sh b/travis-build.sh
index 5ac6bfd5..89846d96 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -5,9 +5,9 @@ set -e
 rm -rf build.paho
 mkdir build.paho
 cd build.paho
-echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD"
-cmake -DCMAKE_BUILD_TYPE=Debug -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE ..
-make
+echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD with OpenSSL root $OPENSSL_ROOT_DIR"
+cmake -DCMAKE_BUILD_TYPE=Debug -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR=$OPENSSL_ROOT_DIR -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE ..
+cmake --build .
 python3 ../test/mqttsas.py &
 ctest -VV --timeout 600
 cpack --verbose
diff --git a/travis-env-vars b/travis-env-vars
deleted file mode 100644
index 2551ccb6..00000000
--- a/travis-env-vars
+++ /dev/null
@@ -1,2 +0,0 @@
-export TRAVIS_OS_NAME=linux
-export TRAVIS_BUILD_DIR=$PWD
diff --git a/travis-macos-vars b/travis-macos-vars
deleted file mode 100644
index bbdbccb5..00000000
--- a/travis-macos-vars
+++ /dev/null
@@ -1,2 +0,0 @@
-export TRAVIS_OS_NAME=osx
-export TRAVIS_BUILD_DIR=$PWD