diff --git a/test-requirements.txt b/test-requirements.txt
index 2e3e93fb6..a51a458ff 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,7 +15,8 @@ ansible>=2.5.1,<2.6 # https://review.openstack.org/567007
 # available, so that it can be evaluated for an orderly transition.
 ansible-lint>=4.1.1a0,<5
 bashate>=0.2
-stestr>=1.0.0 # Apache-2.0
+stestr>=1.0.0,<3.0.0;python_version<'3.5' # Apache-2.0
+stestr>=1.0.0;python_version>='3.5' # Apache-2.0
 # For upload-logs-swift:
 openstacksdk>=0.17.1
 requests