diff --git a/.travis.yml b/.travis.yml
index 83fd00df..1c4551c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+dist: trusty
+sudo: false
+cache: pip
 language: python
 
 # whitelist branches on which tests will be run
@@ -14,25 +17,31 @@ addons:
     - swig
     # needed for GMPY
     - libgmp-dev
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
 
-python:
-  - 2.6
-  - 2.7
-  - 3.2
-  - 3.3
-  - 3.4
-  - 3.5
-  - 3.6
-  - 3.7-dev
-
-env:
-  - TACKPY=true
-  - TACKPY=false
-
-matrix:
-  exclude:
-    - env: TACKPY=true
+jobs:
   include:
+    - python: 2.6
+      env: TACKPY=false
+    - python: 2.7
+      env: TACKPY=false
+    - python: 3.3
+      env: TACKPY=false
+    - python: 3.4
+      env: TACKPY=false
+    - python: 3.5
+      env: TACKPY=false
+    - python: 3.6
+      env: TACKPY=false
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: TACKPY=false
+    - python: 3.8
+      dist: xenial
+      sudo: true
+      env: TACKPY=false
     - python: 2.7
       env: TACKPY=true
     - python: 3.4
@@ -45,6 +54,10 @@ matrix:
       env: M2CRYPTO=true
     - python: 3.6
       env: M2CRYPTO=true
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: M2CRYPTO=true
     - python: 2.7
       env: PYCRYPTO=true
     - python: 3.4
@@ -53,7 +66,9 @@ matrix:
       env: PYCRYPTO=true
     - python: 3.6
       env: PYCRYPTO=true
-    - python: 3.7-dev
+    - python: 3.7
+      dist: xenial
+      sudo: true
       env: PYCRYPTO=true
     - python: 3.7
       dist: xenial
@@ -75,7 +90,9 @@ matrix:
       env: M2CRYPTO=true PYCRYPTO=true GMPY=true
     - python: 3.6
       env: M2CRYPTO=true PYCRYPTO=true GMPY=true
-    - python: 3.7-dev
+    - python: 3.7
+      dist: xenial
+      sudo: true
       env: M2CRYPTO=true PYCRYPTO=true GMPY=true
 
 before_install:
@@ -97,6 +114,8 @@ before_install:
   - git rev-parse HEAD
   - echo "TRAVIS_COMMIT_RANGE=$TRAVIS_COMMIT_RANGE"
   - git fetch origin master:refs/remotes/origin/master
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
 
 install:
   - if [[ -e build-requirements-${TRAVIS_PYTHON_VERSION}.txt ]]; then travis_retry pip install -r build-requirements-${TRAVIS_PYTHON_VERSION}.txt; else travis_retry pip install -r build-requirements.txt; fi
@@ -106,6 +125,7 @@ install:
   - if [[ $PYCRYPTODOME == 'true' ]]; then travis_retry pip install pycryptodome; fi
   - if [[ $GMPY == 'true' ]]; then travis_retry pip install gmpy; fi
   - travis_retry pip install -r requirements.txt
+  - if [[ $CC_COV == 'true' ]]; then ./cc-test-reporter before-build; fi
 
 script:
   - |
@@ -145,7 +165,5 @@ script:
         done
       fi
 
-sudo: false
-
 after_success:
- - coveralls
+ - travis_retry coveralls
diff --git a/build-requirements-2.7.txt b/build-requirements-2.7.txt
index af88a912..c5a7e7d9 100644
--- a/build-requirements-2.7.txt
+++ b/build-requirements-2.7.txt
@@ -3,4 +3,6 @@ coverage
 hypothesis
 coveralls
 pylint
-diff_cover
+mock
+diff_cover<2.5.0
+pytest>=4.6.5
diff --git a/build-requirements.txt b/build-requirements.txt
index b174e59e..46dc3f7e 100644
--- a/build-requirements.txt
+++ b/build-requirements.txt
@@ -3,4 +3,5 @@ hypothesis
 coveralls
 pylint
 diff_cover
-coveralls
+pytest>=4.6.5
+pluggy>=0.7