diff --git a/jck/compiler.api/playlist.xml b/jck/compiler.api/playlist.xml
index 0fd3b41d5f..fbb1f4ef76 100644
--- a/jck/compiler.api/playlist.xml
+++ b/jck/compiler.api/playlist.xml
@@ -19,10 +19,10 @@
 		<variations>
 			<variation>NoOptions</variation>
 		</variations>
-		<command>$(GEN_JTB_GENERIC) testsuite=COMPILER tests=$(JCKCOMPILER_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
+		<command>$(GEN_JTB_GENERIC) testsuite=COMPILER tests="$(JCKCOMPILER_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"; \
 		$(EXEC_COMPILER_TEST); \
 		$(TEST_STATUS); \
-		$(GEN_SUMMARY_GENERIC) testsuite=COMPILER tests=$(JCKCOMPILER_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
+		$(GEN_SUMMARY_GENERIC) testsuite=COMPILER tests="$(JCKCOMPILER_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"
 		</command>
 		<levels>
 			<level>extended</level>
diff --git a/jck/devtools.java2schema/playlist.xml b/jck/devtools.java2schema/playlist.xml
index b0b3c8d84e..6c8946b9cb 100644
--- a/jck/devtools.java2schema/playlist.xml
+++ b/jck/devtools.java2schema/playlist.xml
@@ -18,10 +18,10 @@
 		<variations>
 			<variation>NoOptions</variation>
 		</variations>
-		<command>$(GEN_JTB_GENERIC) testsuite=DEVTOOLS tests=$(JCKDEVTOOLS_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
+		<command>$(GEN_JTB_GENERIC) testsuite=DEVTOOLS tests="$(JCKDEVTOOLS_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"; \
 		$(EXEC_DEVTOOLS_TEST); \
 		$(TEST_STATUS); \
-		$(GEN_SUMMARY_GENERIC) testsuite=DEVTOOLS tests=$(JCKDEVTOOLS_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
+		$(GEN_SUMMARY_GENERIC) testsuite=DEVTOOLS tests="$(JCKDEVTOOLS_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"
 		</command>
 		<levels>
 			<level>extended</level>
diff --git a/jck/jtrunner/JavatestUtil.java b/jck/jtrunner/JavatestUtil.java
index e639df908d..cbb38c35c7 100644
--- a/jck/jtrunner/JavatestUtil.java
+++ b/jck/jtrunner/JavatestUtil.java
@@ -156,7 +156,7 @@ public static void main(String args[]) throws Exception {
 				
 				// We only load testArgs with key,value pairs that are needed by the JavatestUtil 
 				if (essentialParameters.contains(key)) {
-					// This is a special case for JCK where we may supply multiple sub-folders to run
+					// This is a special case to supply multiple sub-folders separating by semicolon( another option is directively supply with double quoted multiple sub-folders separating by space.
 					if(value.contains(";")) {
 						value = value.trim().replace("\n", "").replace("\r", "");
 						String [] tests = value.split(";");
diff --git a/jck/runtime.api/playlist.xml b/jck/runtime.api/playlist.xml
index 03f6878001..94d418896e 100644
--- a/jck/runtime.api/playlist.xml
+++ b/jck/runtime.api/playlist.xml
@@ -19,10 +19,10 @@
 		<variations>
 			<variation>NoOptions</variation>
 		</variations>
-		<command>$(GEN_JTB_GENERIC) testsuite=RUNTIME tests=$(JCKRUNTIME_CUSTOM_TARGET) isCustomTarget="isCustomTarget"; \
+		<command>$(GEN_JTB_GENERIC) testsuite=RUNTIME tests="$(JCKRUNTIME_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"; \
 		$(EXEC_RUNTIME_TEST); \
 		$(TEST_STATUS); \
-		$(GEN_SUMMARY_GENERIC) testsuite=RUNTIME tests=$(JCKRUNTIME_CUSTOM_TARGET) isCustomTarget="isCustomTarget"
+		$(GEN_SUMMARY_GENERIC) testsuite=RUNTIME tests="$(JCKRUNTIME_CUSTOM_TARGET)" isCustomTarget="isCustomTarget"
 		</command>
 		<levels>
 			<level>extended</level>