diff --git a/.travis.yml b/.travis.yml
index 8e99a383e0f..e7e8694530c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,11 @@ os:
   - linux
   # macOS builds are disabled as the machines are under-provisioned on Travis,
   # adding up to an extra hour completing a full CI run.
-  #- osx
 
 compiler:
   - clang
-  - gcc
+  # gcc also works, but to keep the # of concurrent builds down, we use one C
+  # compiler here and the other to run the coverage build.
 
 env:
   - TESTING=cpython
@@ -32,7 +32,7 @@ matrix:
   include:
     - os: linux
       language: python
-      python: 3.5
+      python: 3.6
       env:
         - TESTING=docs
       before_script:
@@ -42,7 +42,7 @@ matrix:
         - make check suspicious html PYTHON="./venv/bin/python" SPHINXBUILD="./venv/bin/python -m sphinx" SPHINXOPTS="-q -W"
     - os: linux
       language: c
-      compiler: clang
+      compiler: gcc
       env:
         - TESTING=coverage
       before_script: