diff --git a/.travis.yml b/.travis.yml
index 14d4e166a..5c18ac9e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,10 @@ env:
     # Specialized factors for py27.
     - TOXENV=py27-nobyte
     - TOXENV=py27-xdist
-    - TOXENV=py27-pluggymaster
+    - TOXENV=py27-pluggymaster-xdist
     # Specialized factors for py37.
     - TOXENV=py37-pexpect,py37-trial,py37-numpy
-    - TOXENV=py37-pluggymaster
+    - TOXENV=py37-pluggymaster-xdist
     - TOXENV=py37-freeze PYTEST_NO_COVERAGE=1
 
 matrix:
diff --git a/appveyor.yml b/appveyor.yml
index 773e16b1b..da4def8f1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,14 +6,13 @@ environment:
   - TOXENV: "py34-xdist"
   - TOXENV: "py35-xdist"
   - TOXENV: "py36-xdist"
+  # NOTE: pypy-xdist is buggy currently (https://github.com/pytest-dev/pytest-xdist/issues/142).
   - TOXENV: "pypy"
     PYTEST_NO_COVERAGE: "1"
   # Specialized factors for py27.
   - TOXENV: "py27-trial,py27-numpy,py27-nobyte"
-  - TOXENV: "py27-pluggymaster"
   # Specialized factors for py37.
   - TOXENV: "py37-trial,py37-numpy"
-  - TOXENV: "py37-pluggymaster"
   - TOXENV: "py37-freeze"
     PYTEST_NO_COVERAGE: "1"
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9f375bbc9..049980efb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,9 +27,9 @@ jobs:
         python.version: '2.7'
         tox.env: 'py27-trial'
         python.needs_vc: True
-      py27-pluggymaster:
+      py27-pluggymaster-xdist:
         python.version: '2.7'
-        tox.env: 'pluggymaster'
+        tox.env: 'py27-pluggymaster-xdist'
       pypy:
         python.version: 'pypy'
         tox.env: 'pypy'
@@ -55,9 +55,9 @@ jobs:
       py37-trial/numpy:
         python.version: '3.7'
         tox.env: 'py37-trial,py37-numpy'
-      py37-pluggymaster:
+      py37-pluggymaster-xdist:
         python.version: '3.7'
-        tox.env: 'py37-pluggymaster'
+        tox.env: 'py37-pluggymaster-xdist'
     maxParallel: 10
 
   steps: