diff --git a/.travis.yml b/.travis.yml
index cb38589a..99855b1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ jobs:
         - brew install libssh2
         - sudo pip2 install -U delocate twine wheel pip setuptools
         - pip2 install --user -r requirements.txt
-        - pip2 wheel .
+        - pip2 wheel --no-deps .
       script:
         - delocate-listdeps --all *.whl
         - delocate-wheel -v *.whl
@@ -60,6 +60,63 @@ jobs:
           fi
       language: generic
       python: skip
+    - stage: OSX wheel build
+      os: osx
+      osx_image: xcode8
+      if: tag IS present
+      before_install:
+        - brew update
+      install:
+        - brew install libssh2
+        - sudo pip2 install -U delocate twine wheel pip setuptools
+        - pip2 install --user -r requirements.txt
+        - pip2 wheel --no-deps .
+      script:
+        - delocate-listdeps --all *.whl
+        - delocate-wheel -v *.whl
+        - delocate-listdeps --all *.whl
+        - ls -l *.whl
+        - brew uninstall libssh2
+        - pip2 install --user -v *.whl
+        - pwd; mkdir temp; cd temp; pwd
+        - python -c "import pssh.pssh2_client"
+        - cd ..; pwd
+      after_success:
+        - if [[ ! -z "$TRAVIS_TAG" ]]; then
+              twine upload -u $PYPI_U -p $PYPI_P *.whl;
+          fi
+      language: generic
+      python: skip
+    - stage: OSX wheel build
+      os: osx
+      osx_image: xcode6.4
+      if: tag IS present
+      before_install:
+        - brew update
+      install:
+        - brew install libssh2
+        - wget --no-check-certificate https://bootstrap.pypa.io/get-pip.py
+        - sudo python get-pip.py
+        - sudo pip install -U pip
+        - sudo pip install -U delocate twine wheel pip setuptools
+        - pip install --user -r requirements.txt
+        - pip wheel --no-deps .
+      script:
+        - delocate-listdeps --all *.whl
+        - delocate-wheel -v *.whl
+        - delocate-listdeps --all *.whl
+        - ls -l *.whl
+        - brew uninstall libssh2
+        - pip install --user -v *.whl
+        - pwd; mkdir temp; cd temp; pwd
+        - python -c "import pssh.pssh2_client"
+        - cd ..; pwd
+      after_success:
+        - if [[ ! -z "$TRAVIS_TAG" ]]; then
+              twine upload -u $PYPI_U -p $PYPI_P *.whl;
+          fi
+      language: generic
+      python: skip
     # - os: linux
     #   stage: build system packages
     #   if: tag IS present
@@ -82,13 +139,20 @@ jobs:
     #       on:
     #         repo: ParallelSSH/parallel-ssh
     #         tags: true
-    - stage: deploy pypi sdist
+    - stage: build and deploy source and wheels
       if: tag IS present
       os: linux
       python: 3.6
       before_install: skip
-      install: skip
-      script: skip
+      install:
+        - pip install twine
+      script:
+        - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" &&
+          ./ci/travis/build-manylinux.sh;
+      after_success:
+        - if [[ ! -z "$TRAVIS_TAG" ]]; then
+            twine upload -u $PYPI_U -p $PYPI_P wheelhouse/*.whl;
+          fi
       deploy:
         - provider: pypi
           user: pkittenis
@@ -100,17 +164,3 @@ jobs:
           distributions: sdist
           skip_upload_docs: true
           skip_cleanup: true
-    - stage: build and deploy wheels
-      if: tag IS present
-      os: linux
-      python: 3.6
-      before_install: skip
-      install:
-        - pip install twine
-      script:
-        - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" &&
-          ./ci/travis/build-manylinux.sh;
-      after_success:
-        - if [[ ! -z "$TRAVIS_TAG" ]]; then
-            twine upload -u $PYPI_U -p $PYPI_P wheelhouse/*.whl;
-          fi