diff --git a/setup.py b/setup.py
index 339381a65f..867dfc17c8 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,8 @@ def get_version(filename):
     zip_safe=False,
     install_requires=[
         'pyyaml<=5.2;python_version=="3.4"',
-        'pyyaml;python_version!="3.4"',
+        'pyyaml<=5.4;python_version=="3.5"',
+        'pyyaml>=5.4;python_version!="3.4" and python_version!="3.5"',
         'six>=1.11',
         'aws-sam-translator>=1.35.0',
         'jsonpatch;python_version!="3.4"',
diff --git a/tox.ini b/tox.ini
index 2d730729b4..773da1b613 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ setenv =
 [testenv:pylint]
 deps =
   pylint_quotes
-  pylint
+  pylint <= 2.7.4
 commands =
   pip install -e .
   pylint --load-plugins pylint_quotes src/cfnlint