diff --git a/.travis.yml b/.travis.yml
index ce7e0e51d..64aa55699 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,12 @@ python:
   - "3.4"
   - "3.5.5"
   - "3.6"
-# - "3.7" is handled in 'Test' job using xenial as Python 3.7 is not available for trusty.
-# - "3.8" is handled in 'Test' job using xenial as Python 3.8 is not available for trusty.
-  - "pypy"
-  - "pypy3"
-install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt"
+  - "3.7"
+  - "3.8"
+  - "pypy2.7-7.3.1"
+  - "pypy3.6-7.3.1"
+#install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt"
+install: "pip install --no-cache-dir --verbose -r requirements/core.txt --log LOG_PIP_CORE; pip install --no-cache-dir -r requirements/test.txt --log LOG_PIP_TEST"
 script: "pytest --cov=optimizely"
 after_success:
   - coveralls
@@ -62,13 +63,6 @@ jobs:
         SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
         FULLSTACK_TEST_REPO=ProdTesting
 
-    - stage: 'Test'
-      dist: xenial
-      python: "3.7"
-    - stage: 'Test'
-      dist: xenial
-      python: "3.8"
-
     - stage: 'Source Clear'
       if: type = cron
       addons: