diff --git a/.travis.yml b/.travis.yml
index 0ce6acf..62d2b75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,13 @@
+sudo: false
 language: python
 
-matrix:
-  include:
-    - python: 2.7
-      env: TOXENV=py27
-    - python: 2.7
-      env: TOXENV=py27-configparser
-    - python: 3.4
-      env: TOXENV=py34
-    - python: 3.5
-      env: TOXENV=py35
-    - python: 3.6
-      env: TOXENV=py36
-    - python: pypy
-      env: TOXENV=pypy
-    - python: pypy3
-      env: TOXENV=pypy3
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "pypy"
+  - "pypy3"
 
 install:
   - git config --global user.email "bumpversion-test-git@travis.ci"
@@ -24,7 +16,7 @@ install:
   - git config --list
   - echo -e '[ui]\nusername = Testing Mercurial on Travis CI <bumpversion-test-hg@travis.ci>' > ~/.hgrc
   - hg --version
-  - pip install --upgrade pytest tox
+  - pip install tox-travis
+
+script: tox
 
-script:
-  - tox -e $TOXENV
diff --git a/appveyor.yml b/appveyor.yml
index 05c2f3f..2c89885 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,24 +11,23 @@ environment:
     - PYTHON: "C:/Python27"
       TOXENV: "py27-configparser"
 
-    - PYTHON: "C:/Python33"
-      TOXENV: "py33"
-
     - PYTHON: "C:/Python34"
       TOXENV: "py34"
 
+    - PYTHON: "C:/Python35"
+      TOXENV: "py35"
+
+    - PYTHON: "C:/Python36"
+      TOXENV: "py36"
+
 init:
   - "ECHO %TOXENV%"
   - "ECHO %PYTHON%"
   - ps: "ls C:/Python*"
 
 install:
-  - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py')
-  - "%PYTHON%/python.exe C:/get-pip.py"
-  - "%PYTHON%/Scripts/pip.exe install virtualenv"
-  - "%PYTHON%/Scripts/pip.exe install tox"
-  - "%PYTHON%/Scripts/pip.exe install mercurial"
-  - "%PYTHON%/Scripts/pip.exe install -e ."
+  - "%PYTHON%/python.exe -m pip install tox"
+  - "%PYTHON%/python.exe -m pip install -e ."
 
   - 'git config --global user.email "bumpversion-test-git@appveyor.ci"'
   - 'git config --global user.name "Testing Git on AppVeyor CI"'