diff --git a/.travis.yml b/.travis.yml
index 34940401f..4a1de9e77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: c++
+os:
+    - linux
+    - osx
 before_install:
 - sh package/linux/travis-decrypt-key
 install:
@@ -49,7 +52,9 @@ notifications:
     use_notice: true
 dist: trusty
 env:
-  matrix: 
+  matrix:
   global:
   - secure: eEVRZNMv7FM6jrOU9iAFkDhWxFQ1WtHBEaObImcvtFUxy6vWSt3ehFFeTRouj3uHQAnbvUzziDyvPPm8/95alv5g/du8ML6YzzqKBKfazM0xQ7SF6R2DQL8lfFIp+RSV7T02byEP1f1g7Zva7xH9szIlDcSfU0pXW4KWbkBFMd8=
   - secure: gj338h+qHGccTD/VQFmEJkqdg2McIe2pO0iZ4Ae9BvY5vxkIML4BpoYZQXQTqiAOETnUjlcknY9lx0hI/PfkDD9MSJc5BC/3fMYRCu3SgAclEwklWf9vvtodUeT69mtnZuw1zze1nTbExuOw2mepbqFjxKKMl+9l5oCz4O54fXU=
+  allow_failures:
+    - os: osx
diff --git a/package/linux/travis-setup.sh b/package/linux/travis-setup.sh
index 3a0493606..cea536aeb 100755
--- a/package/linux/travis-setup.sh
+++ b/package/linux/travis-setup.sh
@@ -3,16 +3,16 @@
 WXVERSION=302
 CACHE=$HOME/cache
 mkdir -p $CACHE
+if [ $TRAVIS_OS_NAME == "linux"; then
+    if [ ! -e $CACHE/boost-compiled.tar.bz2 ]; then
+        echo "Downloading http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2 => $CACHE/boost-compiled.tar.bz2"
+        curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o $CACHE/boost-compiled.tar.bz2
+    fi
 
-if [ ! -e $CACHE/boost-compiled.tar.bz2 ]; then
-    echo "Downloading http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2 => $CACHE/boost-compiled.tar.bz2"
-    curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o $CACHE/boost-compiled.tar.bz2
-fi
-
-if [ ! -e $CACHE/wx${WXVERSION}.tar.bz2 ]; then
-    echo "Downloading http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2 => $CACHE/wx${WXVERSION}.tar.bz2"
-    curl -L "http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2" -o $CACHE/wx${WXVERSION}.tar.bz2
-fi
-
+    if [ ! -e $CACHE/wx${WXVERSION}.tar.bz2 ]; then
+        echo "Downloading http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2 => $CACHE/wx${WXVERSION}.tar.bz2"
+        curl -L "http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2" -o $CACHE/wx${WXVERSION}.tar.bz2
+    fi
 tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
 tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
+fi