diff --git a/.appveyor.yml b/.appveyor.yml
index fdec992e9..1279e0450 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -43,6 +43,10 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
+  # Upgrade to the latest version of pip to avoid it displaying warnings
+  # about it being out of date.
+  - "pip install --disable-pip-version-check --user -U pip"
+
   # Install the build dependencies of the project. If some dependencies contain
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
diff --git a/.travis.yml b/.travis.yml
index 52413b714..73cbef5cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,21 +12,14 @@ os:
   - linux
 
 env:
-  - PIP_DATE=2015-10-01 PIP=1 INSTALL=0 DEVELOP=0
-  - PIP_DATE=2015-10-01 PIP=0 INSTALL=1 DEVELOP=0
-  - PIP_DATE=2015-10-01 PIP=0 INSTALL=0 DEVELOP=1
+  - PIP_DATE=2015-10-01 MODE=pip
+  - PIP_DATE=2015-10-01 MODE=setup-install
+  - PIP_DATE=2015-10-01 MODE=setup-develop
 
 install:
+  - pip install --disable-pip-version-check -U pip
   - python build.py prepare $PIP_DATE
 
 script:
-  - if [[ "$PIP" == "1" ]]; then
-      python build.py pip;
-    fi
-  - if [[ "$INSTALL" == "1" ]]; then
-      python build.py setup-install;
-    fi
-  - if [[ "$DEVELOP" == "1" ]]; then
-      python build.py setup-develop;
-    fi
+  - python build.py $MODE;
   - python build.py test
diff --git a/build.py b/build.py
index 170b5603d..a998b9541 100644
--- a/build.py
+++ b/build.py
@@ -23,7 +23,6 @@ install_mode = sys.argv[1]
 
 if install_mode == 'prepare':
     x('python pip-clear.py')
-    x('pip install --disable-pip-version-check -U pip setuptools')
 
     pip_date = len(sys.argv) > 2 and sys.argv[2]
     if pip_date:
@@ -50,10 +49,6 @@ elif install_mode == 'setup-install':
 
 
 elif install_mode == 'setup-develop':
-    x('python setup.py develop')
-    x('python pip-clear.py')
-
-    x('pip list')
     x('pip install -e .')