diff --git a/.travis.yml b/.travis.yml
index 27140574e1..8c7ecaff58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,23 +3,39 @@ language: c
 sudo: required
 dist: trusty
 
-os: linux
+os:
+  - linux
+  - osx
+
+env:
+  -
+  - DISTRO=Ubuntu1710
+  - DISTRO=Fedora27 CI_BUILD_TYPE=wayland
+  - DISTRO=Fedora27 CI_BUILD_TYPE=misc
+  - DISTRO=Debian91
+  - DISTRO=Archlinux
 
 services:
   - docker
 
 matrix:
-  include:
-    - env: DISTRO=Ubuntu1710
-    - env: DISTRO=Fedora27
-    - env: DISTRO=Fedora27 CI_BUILD_TYPE=wayland
-    - env: DISTRO=Fedora27 CI_BUILD_TYPE=misc
-    - env: DISTRO=Debian91
-    - env: DISTRO=Archlinux
+  fast_finish: true
+  exclude:
     - os: osx
-      osx_image: xcode8.3
-
-# Xcode 8.3.3, OS X 10.12
+      env: DISTRO=Ubuntu1710
+    - os: osx
+      env: DISTRO=Fedora27 CI_BUILD_TYPE=wayland
+    - os: osx
+      env: DISTRO=Fedora27 CI_BUILD_TYPE=misc
+    - os: osx
+      env: DISTRO=Debian91
+    - os: osx
+      env: DISTRO=Archlinux
+    - os: linux
+      env:
+  allow_failures:
+    - os: osx
+      env:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-deps.sh ; fi