diff --git a/.ansible-lint b/.ansible-lint
index d60cf8f07..b53462fff 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -3,6 +3,7 @@ parseable: true
 skip_list:
   - '204'  # [E204] Lines should be no longer than 120 chars
   - '206'  # [E206] Variables should have spaces before and after: {{ var_name }}
+  - '306'
   - '405'
   - '503'  # [E503] Tasks that run when changed should likely be handlers
   - '504'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 86f7c1b6e..738c03180 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-merge-conflict
       - id: debug-statements
   - repo: https://github.com/ansible/ansible-lint
-    rev: v4.0.1
+    rev: 49372c5c3822567f36a809b20e0273020f024ed7
     hooks:
       - id: ansible-lint
         files: \.(yaml|yml)$
diff --git a/tox.ini b/tox.ini
index afd401277..058aa4a9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 2.0
-envlist = py27,py35,py36,py37,linters,dist,insights
+minversion = 3.1.1
+envlist = py27,py37,linters,dist,insights
 skipsdist = True
 
 [testenv]
@@ -55,14 +55,6 @@ commands = {posargs}
 basepython = python2.7
 commands = pytest {posargs}
 
-[testenv:py35]
-basepython = python3.5
-commands = pytest {posargs}
-
-[testenv:py36]
-basepython = python3.6
-commands = pytest {posargs}
-
 [testenv:py37]
 basepython = python3.7
 commands = pytest {posargs}