diff --git a/.travis.yml b/.travis.yml
index 7ed0791..62abcf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,16 @@
 language: ruby
 sudo: false
 cache: bundler
+
+bundler_args: --without development
+
 branches:
   only:
     - master
 
-bundler_args: --without development
+os:
+  - linux
+  - osx
 
 rvm:
   - 2.0
@@ -24,6 +29,7 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
+    - os:  osx # TODO: make tests pass reliably on OS X
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: rbx