--- a/cryptomgmtlibs/securitytestfw/inc/SecurityTests_sdp_9.5.iby	Sat Feb 20 00:36:18 2010 +0200
+++ b/cryptomgmtlibs/securitytestfw/inc/SecurityTests_sdp_9.5.iby	Fri Mar 12 15:51:07 2010 +0200
@@ -57,6 +57,7 @@
 	#include "tpkcs7server.iby"     
 	#include "tpkcs12integrationserver.iby"  	
 	#include "ctframeworktests.iby"
+	#include "cryptotests.iby"
 #else
 	#include "streamingcaf.iby"
 	// iby files for caf
@@ -133,7 +134,11 @@
 	#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
 		data = ZDRIVE\autohardware\runcrypto_wmdrm.bat	               	\runcrypto.bat
 	#else
-		data = ZDRIVE\autohardware\runcrypto_9.5.bat	               	\runcrypto.bat
+		#ifdef __SECURITY_MANDATORY_SWICERTSTORE__
+			data = ZDRIVE\autohardware\runhardwarecrypto.bat				\runcrypto.bat
+		#else
+			data = ZDRIVE\autohardware\runcrypto_9.5.bat	               	\runcrypto.bat
+		#endif
 	#endif
 #else
 	data = ZDRIVE\autohardware\runcrypto_9.4.bat	               	\runcrypto.bat