diff --git a/test/csit/plans/optf/has/setup.sh b/test/csit/plans/optf-has/has/setup.sh
similarity index 96%
rename from test/csit/plans/optf/has/setup.sh
rename to test/csit/plans/optf-has/has/setup.sh
index b2c8143..347399b 100755
--- a/test/csit/plans/optf/has/setup.sh
+++ b/test/csit/plans/optf-has/has/setup.sh
@@ -23,7 +23,7 @@
 echo "# optf/has scripts calling";
 echo "#";
 echo "##########################################################";
-source ${WORKSPACE}/test/csit/scripts/optf/has/has_script.sh
+source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_script.sh
 
 #
 # add here below the start of all docker containers needed for optf/has CSIT testing
diff --git a/test/csit/plans/optf/has/teardown.sh b/test/csit/plans/optf-has/has/teardown.sh
similarity index 96%
rename from test/csit/plans/optf/has/teardown.sh
rename to test/csit/plans/optf-has/has/teardown.sh
index c586d92..80a85f9 100755
--- a/test/csit/plans/optf/has/teardown.sh
+++ b/test/csit/plans/optf-has/has/teardown.sh
@@ -32,12 +32,12 @@
 docker stop cond-api
 docker stop cond-solv
 docker stop cond-cont
-#docker stop cond-data
+docker stop cond-data
 docker stop cond-resv
 
 docker rm cond-api
 docker rm cond-solv
 docker rm cond-cont
-#docker rm cond-data
+docker rm cond-data
 docker rm cond-resv
 
diff --git a/test/csit/plans/optf/has/testplan.txt b/test/csit/plans/optf-has/has/testplan.txt
similarity index 89%
rename from test/csit/plans/optf/has/testplan.txt
rename to test/csit/plans/optf-has/has/testplan.txt
index 0f9f84d..980050c 100644
--- a/test/csit/plans/optf/has/testplan.txt
+++ b/test/csit/plans/optf-has/has/testplan.txt
@@ -1,3 +1,3 @@
 # Test suites are relative paths under [integration.git]/test/csit/tests/.
 # Place the suites in run order.
-optf/has
+optf-has/has
diff --git a/test/csit/plans/optf/osdf/sample.txt b/test/csit/plans/optf-has/osdf/sample.txt
similarity index 100%
rename from test/csit/plans/optf/osdf/sample.txt
rename to test/csit/plans/optf-has/osdf/sample.txt