diff --git a/.zuul.yaml b/.zuul.yaml
index 203f99c..d5c240d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,8 +18,6 @@
       jobs:
         - openstack-tox-linters
         - openstack-tox-py27
-        - openstack-tox-pypy:
-            nodeset: ubuntu-bionic
         - jjb-tox-cross-jenkins-job-builder
     gate:
       jobs:
diff --git a/test-requirements.txt b/test-requirements.txt
index 59476de..c32157f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ requests-mock>=1.4.0
 requests-kerberos
 sphinx>=1.6.0,<2.0.0;python_version=='2.7'  # BSD
 sphinx>=1.6.0;python_version>='3.4'  # BSD
-stestr>=2.0.0
+stestr>=2.0.0,!=3.0.0
 testscenarios
 testtools
 pre-commit
diff --git a/tox.ini b/tox.ini
index a42fa57..8b9c701 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.0
 skipsdist = True
-envlist = py{34,27,35,36}, linters, pypy
+envlist = py{34,27,35,36}, linters
 
 [testenv]
 setenv =