diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/functional/bundles/ceph.yaml b/tests/functional/tests/bundles/ceph.yaml
similarity index 100%
rename from tests/functional/bundles/ceph.yaml
rename to tests/functional/tests/bundles/ceph.yaml
diff --git a/tests/functional/bundles/openstack.yaml b/tests/functional/tests/bundles/openstack.yaml
similarity index 100%
rename from tests/functional/bundles/openstack.yaml
rename to tests/functional/tests/bundles/openstack.yaml
diff --git a/tests/functional/configure/__init__.py b/tests/functional/tests/configure/__init__.py
similarity index 100%
rename from tests/functional/configure/__init__.py
rename to tests/functional/tests/configure/__init__.py
diff --git a/tests/functional/configure/ceph.py b/tests/functional/tests/configure/ceph.py
similarity index 100%
rename from tests/functional/configure/ceph.py
rename to tests/functional/tests/configure/ceph.py
diff --git a/tests/functional/configure/neutron_gateway.py b/tests/functional/tests/configure/neutron_gateway.py
similarity index 100%
rename from tests/functional/configure/neutron_gateway.py
rename to tests/functional/tests/configure/neutron_gateway.py
diff --git a/tests/functional/tests.yaml b/tests/functional/tests/tests.yaml
similarity index 100%
rename from tests/functional/tests.yaml
rename to tests/functional/tests/tests.yaml
diff --git a/tox.ini b/tox.ini
index b79a7a7..bab992c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -64,13 +64,15 @@ commands =
 
 [testenv:func]
 basepython = python3
+changedir = {toxinidir}/tests/functional
 commands =
-    functest-run-suite --test-directory {toxinidir}/tests/functional {posargs}
+    functest-run-suite {posargs}
 
 [testenv:func-target]
 basepython = python3
+changedir = {toxinidir}/tests/functional
 commands =
-    functest-run-suite --test-directory {toxinidir}/tests/functional --bundle {posargs}
+    functest-run-suite  --bundle {posargs}
 
 
 # tools configuration