diff --git a/pom.xml b/pom.xml
index 9d9f2cf9b76..5f89578fd53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <version.io.smallrye.jwt>2.0.13</version.io.smallrye.jwt>
         <version.jakarta.enterprise>2.0.2</version.jakarta.enterprise>
         <version.org.apache.commons>3.8.1</version.org.apache.commons>
-        <version.org.apache.directory.server>2.0.0-M24</version.org.apache.directory.server>
+        <version.org.apache.directory.server>2.0.0.AM26</version.org.apache.directory.server>
         <version.org.apache.directory.api>1.0.0</version.org.apache.directory.api>
         <version.org.apache.directory.jdbm>2.0.0-M3</version.org.apache.directory.jdbm>
         <version.org.apache.directory.mavibot>1.0.0-M8</version.org.apache.directory.mavibot>
diff --git a/tests/base/src/test/java/org/wildfly/security/apacheds/LdapService.java b/tests/base/src/test/java/org/wildfly/security/apacheds/LdapService.java
index 66405961cbd..6952fa783d2 100644
--- a/tests/base/src/test/java/org/wildfly/security/apacheds/LdapService.java
+++ b/tests/base/src/test/java/org/wildfly/security/apacheds/LdapService.java
@@ -143,7 +143,6 @@ public Builder addPartition(final String id, final String partitionName, final i
             for (String current : indexes) {
                 partitionFactory.addIndex(partition, current, indexSize);
             }
-            partition.setCacheService(directoryService.getCacheService());
             partition.initialize();
             directoryService.addPartition(partition);
 
diff --git a/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java b/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java
index 4c25b0e4162..dac1018aafd 100644
--- a/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java
+++ b/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java
@@ -35,7 +35,7 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.function.Supplier;
 
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
diff --git a/tests/base/src/test/java/org/wildfly/security/ldap/DirContextFactoryRule.java b/tests/base/src/test/java/org/wildfly/security/ldap/DirContextFactoryRule.java
index b32c294bc41..6b8753245d2 100644
--- a/tests/base/src/test/java/org/wildfly/security/ldap/DirContextFactoryRule.java
+++ b/tests/base/src/test/java/org/wildfly/security/ldap/DirContextFactoryRule.java
@@ -98,7 +98,6 @@ private static void createStores(KeyStore localhostKeyStore, KeyStore scarabKeyS
                 .addExtension(false, "BasicConstraints", "CA:true,pathlen:2147483647")
                 .build();
         X509Certificate issuerCertificate = issuerSelfSignedX509CertificateAndSigningKey.getSelfSignedCertificate();
-        localhostKeyStore.setCertificateEntry("ca", issuerCertificate);
         trustStore.setCertificateEntry("mykey", issuerCertificate);
 
         // Generates certificate and keystore for Localhost
diff --git a/tests/base/src/test/java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java b/tests/base/src/test/java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java
index a42a8b3074e..0b29b35b41d 100644
--- a/tests/base/src/test/java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java
+++ b/tests/base/src/test/java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java
@@ -72,7 +72,7 @@ public static void createRealm() throws InvalidNameException {
                      AttributeMapping.fromIdentity().from("sn").to("lastName").build(),
                      AttributeMapping.fromIdentity().from("description").to("description").build(),
                      AttributeMapping.fromIdentity().from("telephoneNumber").to("phones").build(),
-                     AttributeMapping.fromFilter("(&(objectClass=groupOfNames)(member={0}))").searchDn("ou=Finance,dc=elytron,dc=wildfly,dc=org").extractRdn("OU").to("businessArea").build())
+                     AttributeMapping.fromFilter("(&(objectClass=groupOfNames)(member=uid={0}))").searchDn("ou=Finance,dc=elytron,dc=wildfly,dc=org").extractRdn("OU").to("businessArea").build())
                 .setNewIdentityParent(new LdapName("dc=elytron,dc=wildfly,dc=org"))
                 .setNewIdentityAttributes(attributes)
                 .setIteratorFilter("(uid=*)")
diff --git a/tests/base/src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java b/tests/base/src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java
index 88789b58e58..a0f4bdc72bd 100644
--- a/tests/base/src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java
+++ b/tests/base/src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java
@@ -117,7 +117,6 @@ private static void createPartition(final DirectoryServiceFactory dsf, final Sch
         for (String current : indexAttributes) {
             pf.addIndex(p, current, 10);
         }
-        p.setCacheService(directoryService.getCacheService());
         p.initialize();
         directoryService.addPartition(p);
     }