diff --git a/requirements/edx/django20.txt b/requirements/edx/django20.txt
new file mode 100644
index 0000000000..6e7e72793f
--- /dev/null
+++ b/requirements/edx/django20.txt
@@ -0,0 +1,3 @@
+Django>=2.0,<2.1
+git+https://github.com/jazzband/django-oauth-toolkit.git@bf1525e85a06929016b1fe35d863e62e58124a2f#egg=oauth2_provider
+
diff --git a/requirements/edx/django21.txt b/requirements/edx/django21.txt
new file mode 100644
index 0000000000..0928dd3f16
--- /dev/null
+++ b/requirements/edx/django21.txt
@@ -0,0 +1,3 @@
+Django>=2.1,<2.2
+git+https://github.com/jazzband/django-oauth-toolkit.git@bf1525e85a06929016b1fe35d863e62e58124a2f#egg=oauth2_provider
+
diff --git a/requirements/edx/django22.txt b/requirements/edx/django22.txt
new file mode 100644
index 0000000000..01de5d0b96
--- /dev/null
+++ b/requirements/edx/django22.txt
@@ -0,0 +1,3 @@
+Django>=2.2,<3.0
+git+https://github.com/jazzband/django-oauth-toolkit.git@bf1525e85a06929016b1fe35d863e62e58124a2f#egg=oauth2_provider
+
diff --git a/scripts/xdist/prepare_xdist_nodes.sh b/scripts/xdist/prepare_xdist_nodes.sh
index c5ec85919d..403afe7fdc 100644
--- a/scripts/xdist/prepare_xdist_nodes.sh
+++ b/scripts/xdist/prepare_xdist_nodes.sh
@@ -11,10 +11,14 @@ python scripts/xdist/pytest_worker_manager.py -a up -n ${XDIST_NUM_WORKERS} \
 -iam ${XDIST_WORKER_IAM_PROFILE_ARN}
 
 # Install the correct version of Django depending on which tox environment (if any) is in use
-if [[ -z ${TOX_ENV+x} ]] || [[ ${TOX_ENV} == 'null' ]]; then
+if [[ -z ${TOXENV+x} ]] || [[ ${TOXENV} == 'null' ]]; then
     DJANGO_REQUIREMENT="-r requirements/edx/django.txt"
-else
-    DJANGO_REQUIREMENT=$(pip freeze | grep "^[Dd]jango==")
+elif [[ ${TOXENV} == *'django20'* ]]; then
+    DJANGO_REQUIREMENT="-r requirements/edx/django20.txt"
+elif [[ ${TOXENV} == *'django21'* ]]; then
+    DJANGO_REQUIREMENT="-r requirements/edx/django21.txt"
+elif [[ ${TOXENV} == *'django22'* ]]; then
+    DJANGO_REQUIREMENT="-r requirements/edx/django22.txt"
 fi
 
 ip_list=$(<pytest_worker_ips.txt)
diff --git a/tox.ini b/tox.ini
index 104f228ed8..a3fc7bb57c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -69,9 +69,9 @@ passenv =
 
 deps =
     django111: -r requirements/edx/django.txt
-    django20: Django>=2.0,<2.1
-    django21: Django>=2.1,<2.2
-    django20,django21: git+https://github.com/jazzband/django-oauth-toolkit.git@bf1525e85a06929016b1fe35d863e62e58124a2f#egg=oauth2_provider
+    django20: -r requirements/edx/django20.txt
+    django21: -r requirements/edx/django21.txt
+    django22: -r requirements/edx/django22.txt
     -r requirements/edx/testing.txt
 whitelist_externals =
     /bin/bash