diff --git a/test/csit/plans/modeling/javatoscachecker/APIs/setup.sh b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh
similarity index 87%
rename from test/csit/plans/modeling/javatoscachecker/APIs/setup.sh
rename to test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh
index 19fc5ed..03d07de 100644
--- a/test/csit/plans/modeling/javatoscachecker/APIs/setup.sh
+++ b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh
@@ -18,5 +18,5 @@
 #
 # Place the scripts in run order:
 
-source ${WORKSPACE}/test/csit/scripts/modeling/javatoscachecker/setup_containers.sh
+source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh
 
diff --git a/test/csit/plans/modeling/javatoscachecker/APIs/teardown.sh b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh
similarity index 86%
rename from test/csit/plans/modeling/javatoscachecker/APIs/teardown.sh
rename to test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh
index 0e149c0..1ecaad4 100644
--- a/test/csit/plans/modeling/javatoscachecker/APIs/teardown.sh
+++ b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh
@@ -17,5 +17,5 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-source ${WORKSPACE}/test/csit/scripts/modeling/javatoscachecker/teardown_containers.sh
+source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh
 
diff --git a/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt
new file mode 100644
index 0000000..f59237b
--- /dev/null
+++ b/test/csit/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt
@@ -0,0 +1,3 @@
+# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Place the suites in run order.
+modeling-toscaparsers-javatoscachecker/APIs