diff --git a/python/setup-test-environment/build.gradle b/python/setup-test-environment/build.gradle
index 38ec46b82c5e..abbb53b4e0ae 100644
--- a/python/setup-test-environment/build.gradle
+++ b/python/setup-test-environment/build.gradle
@@ -83,7 +83,7 @@ envs {
   }
 
 
-  createPython("django_latest", "3.5.4", ["django", "behave-django", "behave"], "python3.5\ndjango\ndjango20\nbehave\nbehave-django\ndjango20", true)
+  createPython("django_latest", "3.5.4", ["django", "behave-django", "behave"], "python3.5\ndjango\ndjango2\nbehave\nbehave-django", true)
    if (djangoTrunkOnly) {
      return
    }
@@ -96,10 +96,10 @@ envs {
                "python2.7\ndjango\nnose\npytest\nbehave\nlettuce\npackaging\ntox\nunittest2\ntwisted\ndjango-nose",
                true)
 
-  createPython("py35_django20_full",
+  createPython("py35_django22_full",
                "3.5.4",
-               ["ipython==2.1", "django==2.0", "behave", "jinja2", "tox>=2.0", "nose", "pytest", "django-nose", "behave-django"],
-               "python3.4\npython3\nipython\nipython200\nskeletons\ndjango\nbehave\ntox\njinja2\npython34\npackaging\npytest\nnose\ndjango-nose\nbehave-django\ndjango20",
+               ["ipython==2.1", "django==2.2", "behave", "jinja2", "tox>=2.0", "nose", "pytest", "django-nose", "behave-django"],
+               "python3.4\npython3\nipython\nipython200\nskeletons\ndjango\nbehave\ntox\njinja2\npython34\npackaging\npytest\nnose\ndjango-nose\nbehave-django\ndjango2",
                true)
 
   createPython("py36_django2_1",