diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
index f3924f59bb5..c36a70d0c93 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {centos7,xenial}-bluestore-{single-type,single-type-dmcrypt}
+envlist = {centos7,xenial}-{bluestore,filestore}-{single_type,single_type_dmcrypt}
 skipsdist = True
 
 [testenv]
@@ -22,10 +22,14 @@ deps=
   pytest-xdist
   notario>=0.0.13
 changedir=
-  centos7-filestore-single-type: {toxinidir}/centos7/filestore/single-type
-  centos7-bluestore-single-type-dmcrypt: {toxinidir}/centos7/bluestore/single-type-dmcrypt
-  xenial-filestore-single-type: {toxinidir}/xenial/filestore/single-type
-  xenial-bluestore-single-type-dmcrypt: {toxinidir}/xenial/bluestore/single-type-dmcrypt
+  centos7-filestore-single_type: {toxinidir}/centos7/filestore/single-type
+  centos7-filestore-single_type_dmcrypt: {toxinidir}/centos7/filestore/single-type-dmcrypt
+  centos7-bluestore-single_type: {toxinidir}/centos7/bluestore/single-type
+  centos7-bluestore-single_type_dmcrypt: {toxinidir}/centos7/bluestore/single-type-dmcrypt
+  xenial-filestore-single_type: {toxinidir}/xenial/filestore/single-type
+  xenial-filestore-single_type_dmcrypt: {toxinidir}/xenial/filestore/single-type-dmcrypt
+  xenial-bluestore-single_type: {toxinidir}/xenial/bluestore/single-type
+  xenial-bluestore-single_type_dmcrypt: {toxinidir}/xenial/bluestore/single-type-dmcrypt
 commands=
   git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible