--- a/cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_addkey.cpp	Fri Oct 02 13:15:59 2009 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/test/tkeystore/t_addkey.cpp	Mon Oct 12 10:17:04 2009 +0300
@@ -85,16 +85,21 @@
 		case EAddKey:
 			{
 			CUnifiedKeyStore* keyStore = CSharedKeyStores::TheUnifiedKeyStores().operator[](iKeystore);
+			if(iKeyStoreImplLabel.Length() != 0)
+					{
+					SetKeyStoreIndex(keyStore);
+					}
+					
 			#ifdef SYMBIAN_AUTH_SERVER		
 			if(iUseNewApi)
 				{
-				keyStore->CreateKey(0, iUsage, iSize, *iLabel, iAlgorithm,
+				keyStore->CreateKey(iKeyStoreImplIndex, iUsage, iSize, *iLabel, iAlgorithm,
 												iAccessType, iStartDate, iEndDate, *iAuthExpression, iFreshness, iKeyInfo, aStatus);
 				}
 			else
 			#endif // SYMBIAN_AUTH_SERVER
 				{
-				keyStore->CreateKey(0, iUsage, iSize, *iLabel, iAlgorithm,
+				keyStore->CreateKey(iKeyStoreImplIndex, iUsage, iSize, *iLabel, iAlgorithm,
 								iAccessType, iStartDate, iEndDate, iKeyInfo, aStatus);
 
 				}