diff --git a/test-requirements.txt b/test-requirements.txt
index 20fa1b0f..48ac8c5a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,6 +13,6 @@ os-testr>=1.0.0 # Apache-2.0
 flake8>=3.3.0
 mock
 responses>=0.8.1
-yapf
+yapf==0.26.0
 
 grpcio-tools==1.16.0
diff --git a/tox.ini b/tox.ini
index 4e10126e..a22e50a5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -66,7 +66,6 @@ commands =
 [testenv:pep8]
 basepython = python3
 deps =
-    yapf
     .[bandit]
     {[testenv]deps}
 commands =
@@ -97,6 +96,7 @@ commands =
 
 [testenv:yapf]
 basepython = python3
+deps = {[testenv]deps}
 commands =
     yapf -ir {toxinidir}/armada {toxinidir}/setup.py