diff --git a/.travis.yml b/.travis.yml
index a319c0922..3936e599b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,6 @@ env:
     - TOXENV=py36-numpy
     - TOXENV=py36-pluggymaster PYTEST_NO_COVERAGE=1
     - TOXENV=py27-nobyte
-    - TOXENV=doctesting
-    - TOXENV=docs PYTEST_NO_COVERAGE=1
 
 jobs:
   include:
@@ -61,7 +59,7 @@ jobs:
       env: TOXENV=py27
     - env: TOXENV=py34
     - env: TOXENV=py36
-    - env: TOXENV=linting PYTEST_NO_COVERAGE=1
+    - env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1
 
     - stage: deploy
       python: '3.6'
diff --git a/appveyor.yml b/appveyor.yml
index 7e2c16561..efc880638 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   matrix:
-  - TOXENV: "linting"
+  - TOXENV: "linting,docs,doctesting"
     PYTEST_NO_COVERAGE: "1"
   - TOXENV: "py27"
   - TOXENV: "py34"
@@ -20,11 +20,8 @@ environment:
   - TOXENV: "py36-pluggymaster"
     PYTEST_NO_COVERAGE: "1"
   - TOXENV: "py27-nobyte"
-  - TOXENV: "doctesting"
   - TOXENV: "py36-freeze"
     PYTEST_NO_COVERAGE: "1"
-  - TOXENV: "docs"
-    PYTEST_NO_COVERAGE: "1"
 
 install:
   - echo Installed Pythons