diff --git a/.gitignore b/.gitignore
index 7e8f0e5..5f3bc30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ output/*/index.html
 docs/_build
 readme-errors
 djpt.results_collected
+
+# Virtual env supports
+.python-version
diff --git a/tests/testapp/tests/test_core_infrastructure.py b/tests/testapp/tests/test_core_infrastructure.py
index 568052a..1604acc 100644
--- a/tests/testapp/tests/test_core_infrastructure.py
+++ b/tests/testapp/tests/test_core_infrastructure.py
@@ -76,8 +76,8 @@ def second_handler_that_will_fail(*a, **kw):
         listeners = [
             first_attached_handler, second_handler_that_will_fail,
             last_attached_handler]
-        for l in listeners:
-            results_collected.connect(l)
+        for listener in listeners:
+            results_collected.connect(listener)
         try:
             with pytest.raises(MyException) as excinfo:
                 with collector:
@@ -88,8 +88,8 @@ def second_handler_that_will_fail(*a, **kw):
             assert first_attached_handler.called
             assert last_attached_handler.called
         finally:
-            for l in listeners:
-                results_collected.disconnect(l)
+            for listener in listeners:
+                results_collected.disconnect(listener)
 
     def test_signal_handler_error_doesnt_hide_orig_error(self, collector_cls):
         collector = collector_cls()
diff --git a/tox.ini b/tox.ini
index 030f962..67dad8f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 # based on https://docs.djangoproject.com/en/1.10/faq/install/#what-python-version-can-i-use-with-django
 [tox]
 envlist =
-   py{27,34,35}-django18,
-   py{27,34,35}-django19,
-   py{27,34,35}-django110,
-   py{27,34,35,36}-django111,
+   python{2.7,3.4,3.5}-django18,
+   python{2.7,3.4,3.5}-django19,
+   python{2.7,3.4,3.5}-django110,
+   python{2.7,3.4,3.5,3.6}-django111,
 
 [testenv]
 commands =
@@ -14,13 +14,12 @@ setenv =
     DJANGO_SETTINGS_MODULE = settings
     PIP_INDEX_URL = https://pypi.python.org/simple/
 deps =
-    py27: mock
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<1.12
+    django{18,19,110,111}: pytest-django>=3,<4
     flake8
-    pytest-django
     docutils
     freezegun
 whitelist_externals = make