diff --git a/test-requirements.txt b/test-requirements.txt
index df7e22df38..5500f007d0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1 @@
-demjson
+PyYAML
diff --git a/tox.ini b/tox.ini
index 53c0c830e4..286a71767a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,4 +8,5 @@ deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
 commands = 
-    {toxinidir}/tools/validate-json.sh
+    {toxinidir}/tools/validate-all-json.sh
+    {toxinidir}/tools/validate-all-yaml.sh