diff --git a/.travis.yml b/.travis.yml
index 20fcba839..e954e0908 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ cache: false
 jobs:
   fast_finish: true
   include:
-    - stage: baseline
+    - stage: test
       python: 3.6
       env:
         - TOXENV=py36-dj20-postgres-xdist-coverage
@@ -99,7 +99,7 @@ install:
   - pip install tox==3.9.0
 
 script:
-  - tox
+  - tox --force-dep "pytest@git+https://github.com/blueyed/pytest@mm-fixture-stack#egg=pytest"
 
 after_success:
   - |
diff --git a/tox.ini b/tox.ini
index 2a75506b4..e656ed4dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,8 @@ deps =
     postgres: psycopg2-binary
     coverage: coverage-enable-subprocess
 
+    pytest
+
     pytest41: pytest>=4.1,<4.2
     pytest41: attrs==17.4.0
     pytest53: pytest>=5.3,<5.4