diff --git a/.travis.yml b/.travis.yml
index dcc1db3..b20b541 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,39 @@
 sudo: false
+
 branches:
   only:
     - py27
+
 language: python
-python:
-  - "2.7"
-  - "pypy2.7"
-install: pip install tox-travis
+
+matrix:
+  include:
+    # Python 2.7
+    - python: "2.7"
+      os: "linux"
+      dist: trusty
+      env: TOXENV=py27
+
+    #- os: "osx"
+    #  language: generic
+    #  env: TOXENV=py27
+
+    # PyPy 2.7
+    - python: "pypy-5.4.1"
+      os: "linux"
+      dist: trusty
+      env: TOXENV=pypy
+
+  allow_failures:
+    - python: "pypy2.7"
+    - os: "osx"
+
+cache:
+  directories:
+    - $PWD/wheelhouse  # cache wheels so that we don't hit network everytime
+env:
+  global:
+    - PIP_FIND_LINKS=$PWD/wheelhouse
+
+install: ./.travis/install.sh
 script: tox
\ No newline at end of file
diff --git a/.travis/install.sh b/.travis/install.sh
new file mode 100755
index 0000000..deff563
--- /dev/null
+++ b/.travis/install.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+
+    # Install custom requirements on OS X
+    brew install pyenv-virtualenv
+
+    case "${TOXENV}" in
+        py27)
+            # Install some custom Python 3.2 requirements on OS X
+            echo 'Nothing to do'
+            ;;
+    esac
+else
+    # Install custom requirements on Linux
+    pip install tox-travis
+fi
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index f5de569..2b9861d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
-envlist = py27,pypy
+envlist = py27, pypy
 platform = linux2
+skipsdist = True
 
 [testenv]
 deps =