--- a/cryptomgmtlibs/securitytestfw/inc/SecurityTests_sdp_9.5.iby	Tue Jan 26 13:18:49 2010 +0200
+++ b/cryptomgmtlibs/securitytestfw/inc/SecurityTests_sdp_9.5.iby	Fri Mar 19 10:03:04 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
@@ -131,9 +132,17 @@
 
 #ifdef SYMBIAN_CRYPTOSPI
 	#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-		data = ZDRIVE\autohardware\runcrypto_wmdrm.bat	               	\runcrypto.bat
+		#ifdef __SECURITY_MANDATORY_SWICERTSTORE__
+			data = ZDRIVE\autohardware\runhardwarecrypto.bat				\runcrypto.bat
+		#else
+			data = ZDRIVE\autohardware\runcrypto_wmdrm.bat	               	\runcrypto.bat
+		#endif		
 	#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