diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/Vagrantfile b/tests/functional/centos/7/cluster/Vagrantfile
similarity index 100%
rename from tests/functional/centos/7/mon-osd-mds-rgw/Vagrantfile
rename to tests/functional/centos/7/cluster/Vagrantfile
diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all
similarity index 100%
rename from tests/functional/centos/7/mon-osd-mds-rgw/group_vars/all
rename to tests/functional/centos/7/cluster/group_vars/all
diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/group_vars/osds b/tests/functional/centos/7/cluster/group_vars/osds
similarity index 100%
rename from tests/functional/centos/7/mon-osd-mds-rgw/group_vars/osds
rename to tests/functional/centos/7/cluster/group_vars/osds
diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/hosts b/tests/functional/centos/7/cluster/hosts
similarity index 100%
rename from tests/functional/centos/7/mon-osd-mds-rgw/hosts
rename to tests/functional/centos/7/cluster/hosts
diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/scenario.py b/tests/functional/centos/7/cluster/scenario.py
similarity index 100%
rename from tests/functional/centos/7/mon-osd-mds-rgw/scenario.py
rename to tests/functional/centos/7/cluster/scenario.py
diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/vagrant_variables.yml b/tests/functional/centos/7/cluster/vagrant_variables.yml
similarity index 100%
rename from tests/functional/centos/7/mon-osd-mds-rgw/vagrant_variables.yml
rename to tests/functional/centos/7/cluster/vagrant_variables.yml
diff --git a/tox.ini b/tox.ini
index c78acc364..5ee3d12bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ changedir=
   # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario
   dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/dmcrypt-journal-collocation
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using raw_multi_journal OSD scenario
-  centos7_cluster: {toxinidir}/tests/functional/centos/7/mon-osd-mds-rgw
+  centos7_cluster: {toxinidir}/tests/functional/centos/7/cluster
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker
   docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster
 commands=