diff --git a/src/tests/multihost/basic/test_ldap.py b/src/tests/multihost/basic/test_ldap.py
index 2ea483b8d82..ceb0d54fbc8 100644
--- a/src/tests/multihost/basic/test_ldap.py
+++ b/src/tests/multihost/basic/test_ldap.py
@@ -90,6 +90,7 @@ def _change_test_reset_password(multihost):
         client.change_user_password(
             user, 'Secret1234', 'Secret1234', 'Secret123', 'Secret123')
 
+    @pytest.mark.converted('test_ldap.py', 'test_ldap__change_password')
     @staticmethod
     def test_ldap_chpass_extop(multihost):
         """
@@ -99,6 +100,7 @@ def test_ldap_chpass_extop(multihost):
         """
         TestLDAPChpass._change_test_reset_password(multihost)
 
+    @pytest.mark.converted('test_ldap.py', 'test_ldap__change_password')
     @staticmethod
     @pytest.mark.usefixtures("set_ldap_auth_provider",
                              "set_ldap_pwmodify_mode_ldap_modify")
diff --git a/src/tests/system/tests/test_ldap.py b/src/tests/system/tests/test_ldap.py
new file mode 100644
index 00000000000..c5d8e3aad17
--- /dev/null
+++ b/src/tests/system/tests/test_ldap.py
@@ -0,0 +1,58 @@
+"""
+SSSD LDAP provider tests
+
+:requirement: IDM-SSSD-REQ : LDAP Provider
+"""
+
+from __future__ import annotations
+
+import pytest
+from sssd_test_framework.roles.client import Client
+from sssd_test_framework.roles.ldap import LDAP
+from sssd_test_framework.topology import KnownTopology
+
+
+@pytest.mark.parametrize("modify_mode", ["exop", "ldap_modify"])
+@pytest.mark.topology(KnownTopology.LDAP)
+def test_ldap__change_password(client: Client, ldap: LDAP, modify_mode: str):
+    """
+    :title: Change password with "ldap_pwmodify_mode" set to "exop" and then to "ldap_modify"
+    :setup:
+        1. Add user to SSSD, set his password
+        2. Allow user to change his password
+        3. Set "ldap_pwmodify_mode"
+        4. Start SSSD
+    :steps:
+        1. Check that "ldap_pwmodify_mode" is properly set
+        2. Authenticate user with old password
+        3. Change password of user to new password
+        4. Authenticate user with new password
+        5. Authenticate user with old password
+    :expectedresults:
+        1. Config is properly set
+        2. User is authenticated
+        3. Password is changed successfully
+        4. User is authenticated
+        5. User is not authenticated
+    :customerscenario: False
+    """
+    user = "user1"
+    old_pass = "Secret123"
+    new_pass = "New_password123"
+
+    ldap.user(user).add(password=old_pass)
+    ldap.aci.add('(targetattr="userpassword")(version 3.0; acl "pwp test"; allow (all) userdn="ldap:///self";)')
+    client.sssd.dom("test")["ldap_pwmodify_mode"] = modify_mode
+
+    client.sssd.start()
+
+    ldb = client.ldb.search("/var/lib/sss/db/config.ldb", "cn=test,cn=domain,cn=config")
+    assert ldb["cn=test,cn=domain,cn=config"]["ldap_pwmodify_mode"] == [modify_mode]
+
+    assert client.auth.ssh.password(user, old_pass)
+
+    with client.ssh(user, old_pass) as ssh:
+        assert client.auth.passwd(ssh).password(user, old_pass, new_pass), "Password change was not successful"
+
+    assert client.auth.ssh.password(user, new_pass), "Authentication with new correct password failed"
+    assert not client.auth.ssh.password(user, old_pass), "Authentication with old incorrect password did not fail"