diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/docker-compose.yml b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
similarity index 100%
rename from test/csit/plans/dcaegen2/hv-ves-testsuites/docker-compose.yml
rename to test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/setup.sh b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
similarity index 100%
rename from test/csit/plans/dcaegen2/hv-ves-testsuites/setup.sh
rename to test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/Makefile b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/Makefile
similarity index 100%
rename from test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/Makefile
rename to test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/Makefile
diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/README.md b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/README.md
similarity index 100%
rename from test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/README.md
rename to test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/README.md
diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/teardown.sh b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
similarity index 100%
rename from test/csit/plans/dcaegen2/hv-ves-testsuites/teardown.sh
rename to test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/testplan.txt b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt
similarity index 74%
rename from test/csit/plans/dcaegen2/hv-ves-testsuites/testplan.txt
rename to test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt
index 3f4f148..e9a7f63 100644
--- a/test/csit/plans/dcaegen2/hv-ves-testsuites/testplan.txt
+++ b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt
@@ -1,4 +1,4 @@
 # Test suites are relative paths under [integration.git]/test/csit/tests/.
 # Place the suites in run order.
-dcaegen2/hv-ves-testcases
+dcaegen2-collectors-hv-ves/testcases
 
diff --git a/test/csit/tests/dcaegen2/hv-ves-testcases/__init__.robot b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
similarity index 100%
rename from test/csit/tests/dcaegen2/hv-ves-testcases/__init__.robot
rename to test/csit/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
diff --git a/test/csit/tests/dcaegen2/hv-ves-testcases/hv-ves.robot b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/hv-ves.robot
similarity index 100%
rename from test/csit/tests/dcaegen2/hv-ves-testcases/hv-ves.robot
rename to test/csit/tests/dcaegen2-collectors-hv-ves/testcases/hv-ves.robot