diff --git a/.ci/travis.sh b/.ci/travis.sh
index 5d102812..cd3bf088 100755
--- a/.ci/travis.sh
+++ b/.ci/travis.sh
@@ -2,11 +2,14 @@
 
 echo $TRAVIS_PYTHON_VERSION
 
+# Listed twice to workaround Python 2.6
 if [[ "$(uname -s)" == 'Darwin' ]]; then
+    python$PY3 -m pip install --upgrade pip
     python$PY3 -m pip install -r dev-requirements.txt
     python$PY3 -m pip install coveralls
     python$PY3 -m pip install -e .
 else
+    pip install --upgrade pip
     pip install -r dev-requirements.txt
     pip install coveralls
     pip install -e .
diff --git a/.travis.yml b/.travis.yml
index de0a7a66..481027eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 sudo: required
 language: python
-dist: trusty
+dist: xenial
 matrix:
   include:
     - python: 2.6
+      dist: trusty
       env: PYV=2.6
       before_install:
         -  pip install pycparser==2.17
@@ -17,20 +18,20 @@ matrix:
       env: PYV=3.6
     - python: 3.7
       env: PYV=3.7
-      dist: xenial
 #    - python: nightly
     - python: pypy
     - language: generic
       env: PY3=2 PYV=Mac2
       os: osx
       before_install:
-        - python2 -m ensurepip --upgrade
+        - python2 -m ensurepip
     - language: generic
       os: osx
       env: PY3=3 PYV=Mac3
-      before_install:
-        - brew update || echo "Already updated"
-        - brew upgrade python@3 || echo "Python3 already installed"
+      addons:
+        homebrew:
+          packages:
+            - python
 
 install: .ci/travis.sh
 script: python$PY3 setup.py test -c
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 3b1f9f57..3e56a7c5 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -5,4 +5,6 @@ idna<2.8 ; python_version < '2.7'
 pycparser<2.18 ; python_version < '2.7'
 paramiko<2.4 ; python_version < '2.7'
 paramiko ; python_version >= '2.7'
+setuptools
+wheel ; python_version >= '2.7'
 psutil
diff --git a/setup.py b/setup.py
index b3177907..ec6540fd 100644
--- a/setup.py
+++ b/setup.py
@@ -67,8 +67,6 @@ def run(self):
     keywords = "path, local, remote, ssh, shell, pipe, popen, process, execution, color, cli",
     cmdclass = {'test':PyTest,
                 'docs':PyDocs},
-    # use_2to3 = False,
-    # zip_safe = True,
     long_description = open(os.path.join(HERE, "README.rst"), "r").read(),
     classifiers = [
         "Development Status :: 5 - Production/Stable",
diff --git a/tests/test_remote.py b/tests/test_remote.py
index 9fd925c4..b8207f51 100644
--- a/tests/test_remote.py
+++ b/tests/test_remote.py
@@ -290,7 +290,7 @@ def test_iter_lines_error(self):
                 for i, lines in enumerate(rem["ls"]["--bla"].popen()):
                     pass
                 assert i == 1
-            assert ex.value.stderr.startswith("/bin/ls: ")
+            assert "/bin/ls: " in ex.value.stderr
 
     def test_touch(self):
         with self._connect() as rem: