diff --git a/core-java-modules/core-java-security-4/src/test/java/com/baeldung/keystorealias/KeystoreCertificateNameAliasUnitTest.java b/core-java-modules/core-java-security-4/src/test/java/com/baeldung/keystorealias/KeystoreCertificateNameAliasUnitTest.java
new file mode 100644
index 0000000000..47bc4c3425
--- /dev/null
+++ b/core-java-modules/core-java-security-4/src/test/java/com/baeldung/keystorealias/KeystoreCertificateNameAliasUnitTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.keystorealias;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
+
+import org.junit.jupiter.api.Test;
+
+public class KeystoreCertificateNameAliasUnitTest {
+    private static final String KEYSTORE_FILE = "my-keystore.jks";
+    private static final String KEYSTORE_PWD = "storepw@1";
+    private static final String KEYSTORE_ALIAS = "baeldung";
+
+    private KeyStore readKeyStore() throws Exception {
+        KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
+        keystore.load(getClass().getResourceAsStream(KEYSTORE_FILE), KEYSTORE_PWD.toCharArray());
+        return keystore;
+    }
+
+    @Test
+    void whenCheckingAliasAndName_thenMatchIsFound() throws Exception {
+        KeyStore keystore = readKeyStore();
+
+        assertThat(keystore.containsAlias(KEYSTORE_ALIAS)).isTrue();
+
+        X509Certificate x509Certificate = (X509Certificate) keystore.getCertificate(KEYSTORE_ALIAS);
+        String owner = x509Certificate.getSubjectX500Principal().getName();
+        assertThat(owner.contains("my-cn.localhost")).isTrue();
+    }
+
+    @Test
+    void whenCheckingAliasAndName_thenNameIsNotFound() throws Exception {
+        KeyStore keystore = readKeyStore();
+
+        assertThat(keystore.containsAlias(KEYSTORE_ALIAS)).isTrue();
+
+        X509Certificate x509Certificate = (X509Certificate) keystore.getCertificate(KEYSTORE_ALIAS);
+        String owner = x509Certificate.getSubjectX500Principal()
+            .getName();
+        assertThat(owner.contains("commonName1")).isFalse();
+    }
+
+    @Test
+    void whenCheckingAliasAndName_thenAliasIsNotFound() throws Exception {
+        KeyStore keystore = readKeyStore();
+
+        assertThat(keystore.containsAlias("alias1")).isFalse();
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-security-4/src/test/resources/com/baeldung/keystorealias/my-keystore.jks b/core-java-modules/core-java-security-4/src/test/resources/com/baeldung/keystorealias/my-keystore.jks
new file mode 100644
index 0000000000..8f7709ee96
Binary files /dev/null and b/core-java-modules/core-java-security-4/src/test/resources/com/baeldung/keystorealias/my-keystore.jks differ