diff --git a/.travis.yml b/.travis.yml
index f16271a..59116f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,24 @@
 language: python
+sudo: false
 
-python:
-  - 3.3
-  - 3.4
-  - 3.5
+matrix:
+  include:
+    - os: linux
+      python: 3.3
+    - os: linux
+      python: 3.4
+    - os: linux
+      python: 3.5
+    - os: linux
+      python: 3.6
+    - os: osx
+      language: generic
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi
 
 install:
-  - pip install --upgrade -e .[test]
+  - pip3 install --upgrade -e .[test]
 
 script:
-  - python setup.py test
-
-sudo: false
+  - python3 setup.py test
\ No newline at end of file