diff --git a/.appveyor.yml b/.appveyor.yml
index 3a7d2f63..11bb6d4b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,16 +1,16 @@
 environment:
   global:
-    TOXENV: py
+    TOXENV: py,codecov
 
   matrix:
-    - PYTHON: C:\Python36
-    - PYTHON: C:\Python27
+    - PYTHON: C:\Python36-x64
+    - PYTHON: C:\Python27-x64
 
 init:
   - SET PATH=%PYTHON%;%PATH%
 
 install:
-  - python -m pip install -U pip setuptools wheel tox
+  - python -m pip install -U tox
 
 build: false
 
@@ -21,3 +21,6 @@ branches:
   only:
     - master
     - /^.*-maintenance$/
+
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
diff --git a/.travis.yml b/.travis.yml
index 0ff95ecd..b3ba1e19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,27 +14,30 @@ matrix:
       env: TOXENV=py,codecov
     - python: 2.7
       env: TOXENV=py,simplejson,devel,lowest,codecov
-    - python: pypy
+    - python: pypy3
       env: TOXENV=py,codecov
     - python: nightly
       env: TOXENV=py
     - os: osx
       language: generic
-      env: TOXENV=py
+      env: TOXENV=py3,py2,codecov
+      cache:
+        pip: false
+        directories:
+          - $HOME/Library/Caches/Homebrew
+          - $HOME/Library/Caches/pip
   allow_failures:
+    - python: pypy3
     - python: nightly
-      env: TOXENV=py
     - os: osx
-      language: generic
-      env: TOXENV=py
   fast_finish: true
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew update;
-      brew install python3 redis memcached;
-      virtualenv -p python3 ~/py-env;
-      . ~/py-env/bin/activate;
+  - |
+    if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+      brew upgrade python
+      brew install python@2;
+      export PATH="/usr/local/opt/python/libexec/bin:${PATH}"
     fi
 
 install:
diff --git a/tox.ini b/tox.ini
index 03e53d90..546b9279 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,7 +60,7 @@ commands =
     coverage html
 
 [testenv:codecov]
-passenv = CI TRAVIS TRAVIS_*
+passenv = CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_*
 deps = codecov
 skip_install = true
 commands =