diff --git a/components/org.wso2.carbon.identity.sso.saml/src/test/java/org/wso2/carbon/identity/sso/saml/util/SAMLSSOUtilTest.java b/components/org.wso2.carbon.identity.sso.saml/src/test/java/org/wso2/carbon/identity/sso/saml/util/SAMLSSOUtilTest.java
index 435ee58f1..2d554dae4 100644
--- a/components/org.wso2.carbon.identity.sso.saml/src/test/java/org/wso2/carbon/identity/sso/saml/util/SAMLSSOUtilTest.java
+++ b/components/org.wso2.carbon.identity.sso.saml/src/test/java/org/wso2/carbon/identity/sso/saml/util/SAMLSSOUtilTest.java
@@ -62,6 +62,7 @@
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.user.core.tenant.TenantManager;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+import org.wso2.carbon.utils.security.KeystoreUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -84,7 +85,8 @@
  */
 @PrepareForTest({IdentityProviderManager.class, IdentityUtil.class, IdentityApplicationManagementUtil.class,
         KeyStoreManager.class, IdentitySAMLSSOServiceComponentHolder.class, SSOServiceProviderConfigManager.class,
-        IdentityTenantUtil.class, ServiceURLBuilder.class, IdentityConstants.class, FrameworkServiceComponent.class})
+        IdentityTenantUtil.class, ServiceURLBuilder.class, IdentityConstants.class, FrameworkServiceComponent.class,
+        KeystoreUtils.class})
 @PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.dom.*", "org.apache.xerces.*"})
 public class SAMLSSOUtilTest extends PowerMockTestCase {
 
@@ -135,6 +137,13 @@ public void setUp() throws Exception {
         TestUtils.startTenantFlow(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
     }
 
+    private void prepareForGetKeyStorePath() throws Exception {
+        mockStatic(KeystoreUtils.class);
+        when(KeystoreUtils.getKeyStoreFileLocation(TestConstants.WSO2_TENANT_DOMAIN)).thenReturn(TestConstants
+                .WSO2_TENANT_DOMAIN.replace(".", "-") + TestUtils.getFilePath(TestConstants.KEY_STORE_NAME));
+    }
+
+
     private void prepareForGetIssuer() throws Exception {
 
         mockStatic(IdentityTenantUtil.class);
@@ -412,6 +421,7 @@ public void testGetX509CredentialImplForSuperTenant() throws Exception {
     public void testGetX509CredentialImplForTenant() throws Exception {
 
         prepareForGetIssuer();
+        prepareForGetKeyStorePath();
         mockStatic(FrameworkServiceComponent.class);
         when(FrameworkServiceComponent.getRealmService()).thenReturn(realmService);
         when(realmService.getTenantManager()).thenReturn(tenantManager);
@@ -430,6 +440,7 @@ public void testGetX509CredentialImplForTenant() throws Exception {
     public void testGetX509CredentialImplException() throws Exception {
 
         prepareForGetIssuer();
+        prepareForGetKeyStorePath();
         when(tenantManager.getTenantId(anyString())).thenReturn(1);
         mockStatic(KeyStoreManager.class);
         when(KeyStoreManager.getInstance(eq(1))).thenReturn(keyStoreManager);
diff --git a/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.jks b/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.jks
deleted file mode 100644
index b4b6220ba..000000000
Binary files a/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.jks and /dev/null differ
diff --git a/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.p12 b/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.p12
new file mode 100644
index 000000000..8c9638347
Binary files /dev/null and b/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.p12 differ
diff --git a/pom.xml b/pom.xml
index 329eb5ed6..479043b73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -455,7 +455,7 @@
     </modules>
 
     <properties>
-        <carbon.kernel.version>4.9.22-SNAPSHOT</carbon.kernel.version>
+        <carbon.kernel.version>4.9.23</carbon.kernel.version>
         <carbon.kernel.feature.version>4.9.0</carbon.kernel.feature.version>
         <carbon.identity.framework.version>5.25.507</carbon.identity.framework.version>
         <carbon.identity.framework.imp.pkg.version.range>[5.25.260, 7.0.0)