diff --git a/.travis.yml b/.travis.yml
index 2e71216..d395eb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: required
-services: [docker]
 env:
   global:
     - CIBW_TEST_REQUIRES=nose
@@ -8,15 +6,27 @@ env:
 matrix:
   include:
     - os: linux
+      dist: xenial
       language: python
+      python: 3.6
+      env:
+        - INSTALL_SOURCE=true
     - os: osx
-      language: ruby
+      sudo: required
+      language: generic
 
 script:
-- pip install cibuildwheel==0.9.4
+- |
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      sudo pip3 install cibuildwheel==0.10.1 twine
+    else
+      pip3 install cibuildwheel==0.10.1 twine
+    fi
 - cibuildwheel --output-dir wheelhouse
 - |
     if [[ $TRAVIS_TAG ]]; then
-      python -m pip install twine
-      python -m twine upload wheelhouse/*.whl
+      if [[ -n $INSTALL_SOURCE ]]; then
+        python3 setup.py sdist
+      fi
+      twine upload wheelhouse/*.whl
     fi