diff --git a/test-requirements.txt b/test-requirements.txt
index 43d563a78f1..6ed1b867883 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 flake8-import-order==0.12 # LGPLv3
-pycodestyle>=2.0.0 # MIT
+pycodestyle>=2.0.0,<2.6.0 # MIT
 mock>=3.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT