diff --git a/functional/security/Crypto/playlist.xml b/functional/security/Crypto/playlist.xml
index 1a7686bfda..869f055450 100644
--- a/functional/security/Crypto/playlist.xml
+++ b/functional/security/Crypto/playlist.xml
@@ -31,13 +31,10 @@
 				<platform>.*solaris</platform>
 			</disable>
 		</disables>
-		<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
-		-a -xml -v:fail,error,time,nopass,summary -Dcryptotests.skipAgentTests=1 -timeoutFactor:2 \
-		-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-		-r $(Q)$(REPORTDIR)$(D)report$(Q) \
-		-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
-		$(Q)$(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(Q); \
-		$(TEST_STATUS)</command>
+		<command>
+			JTREG_HOME="$(TEST_RESROOT)$(D)jtreg" \
+			SKIP_AGENT_TESTS=1 $(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(D)run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS)
+		</command>
 		<features>
 			<feature>FIPS140_2:nonapplicable</feature>
 		</features>