diff --git a/.travis.yml b/.travis.yml
index d82a6af109..9b4dccdafe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,22 @@
 language: cpp
 sudo: required
 
-compiler: gcc
+matrix:
+    include:
+        - compiler: gcc
+        - compiler: gcc
+          env: wxCONFIGURE_FLAGS="--disable-precomp-headers --enable-monolithic"
+        - dist: trusty
+          compiler: gcc
+        - dist: trusty
+          compiler: gcc
+          env: wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl"
+        - dist: trusty
+          compiler: clang
+          env: wxCONFIGURE_FLAGS="--disable-shared"
+        - os: osx
+          compiler: clang
+          env: wxCONFIGURE_FLAGS="--enable-cxx11"
 
 branches:
     only:
@@ -21,12 +36,6 @@ notifications:
 
 before_install: ./build/tools/before_install.sh
 
-env:
-    - wxCONFIGURE_FLAGS=
-    - wxCONFIGURE_FLAGS="--disable-shared"
-    - wxCONFIGURE_FLAGS="--disable-precomp-headers --enable-monolithic"
-    - wxCONFIGURE_FLAGS="--enable-stl" CXXFLAGS=-std=c++0x
-
 script:
     - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r'
     - ./configure --disable-optimise $wxCONFIGURE_FLAGS
diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh
index 1fd3fe1209..1adc73ed1b 100755
--- a/build/tools/before_install.sh
+++ b/build/tools/before_install.sh
@@ -2,7 +2,7 @@
 #
 # This script is used by Travis CI to install the dependencies before building
 # wxWidgets but can also be run by hand if necessary but currently it only
-# works for Ubuntu 12.04 and 14.04 used by Travis.
+# works for Ubuntu 12.04 and 14.04 and OS X used by Travis builds.
 
 SUDO=sudo
 
@@ -13,4 +13,9 @@ case $(uname -s) in
             $SUDO apt-get install -y libcppunit-dev libgtk2.0-dev libnotify-dev
         fi
         ;;
+
+    Darwin)
+        brew update
+        brew install cppunit --universal
+        ;;
 esac