diff --git a/test-requirements.txt b/test-requirements.txt
index 0f49ac07..cd500a4e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,4 +13,5 @@ os-testr>=1.0.0 # Apache-2.0
 flake8>=3.3.0
 mock
 responses>=0.8.1
-yapf
+# TODO: Resolve issues with >=0.24.0
+yapf<=0.23.0
diff --git a/tox.ini b/tox.ini
index 768ac6e5..8e489a08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,7 +65,6 @@ commands =
 [testenv:pep8]
 basepython = python3
 deps =
-    yapf
     .[bandit]
     {[testenv]deps}
 commands =