diff --git a/tests/requirements2.2.txt b/tests/requirements2.2.txt
new file mode 100644
index 000000000..3e7980a12
--- /dev/null
+++ b/tests/requirements2.2.txt
@@ -0,0 +1,3 @@
+# These are Python requirements needed to run the functional tests
+testinfra==1.6.0
+pytest-xdist
diff --git a/tests/requirements.txt b/tests/requirements2.4.txt
similarity index 100%
rename from tests/requirements.txt
rename to tests/requirements2.4.txt
diff --git a/tox.ini b/tox.ini
index d3874096c..bf25fa2fb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-envlist = {dev,jewel,luminous,rhcs}-{ansible2.2,ansible2.3}-{xenial_cluster,centos7_cluster,docker_cluster,update_cluster,cluster,update_docker_cluster,switch_to_containers,purge_filestore_osds_container,purge_filestore_osds_non_container,purge_cluster_non_container,purge_cluster_container}
-  {dev,luminous}-{ansible2.2,ansible2.3}-{filestore_osds_non_container,filestore_osds_container,bluestore_osds_container,bluestore_osds_non_container,bluestore_lvm_osds,lvm_osds,purge_lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,purge_bluestore_osds_non_container,purge_bluestore_osds_container}
+envlist = {dev,jewel,luminous,rhcs}-{ansible2.2,ansible2.3,ansible2.4}-{xenial_cluster,centos7_cluster,docker_cluster,update_cluster,cluster,update_docker_cluster,switch_to_containers,purge_filestore_osds_container,purge_filestore_osds_non_container,purge_cluster_non_container,purge_cluster_container}
+  {dev,luminous}-{ansible2.2,ansible2.3,ansible2.4}-{filestore_osds_non_container,filestore_osds_container,bluestore_osds_container,bluestore_osds_non_container,bluestore_lvm_osds,lvm_osds,purge_lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,purge_bluestore_osds_non_container,purge_bluestore_osds_container}
 
 skipsdist = True
 
@@ -154,9 +154,11 @@ setenv=
   bluestore_lvm_osds: CEPH_STABLE_RELEASE = luminous
 deps=
   ansible2.2: ansible==2.2.3
+  ansible2.2: -r{toxinidir}/tests/requirements2.2.txt
   ansible2.3: ansible==2.3.1
+  ansible2.3: -r{toxinidir}/tests/requirements2.2.txt
   ansible2.4: ansible==2.4.1
-  -r{toxinidir}/tests/requirements.txt
+  ansible2.4: -r{toxinidir}/tests/requirements2.4.txt
 changedir=
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario
   xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster