diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java
index 8bc29fb3fa8..5b98ab0b381 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModuleTest.java
@@ -22,6 +22,7 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
+import javax.net.ssl.SSLContext;
 import javax.security.auth.Subject;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
@@ -42,6 +43,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport;
 import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
 import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
 import org.apache.activemq.artemis.utils.SensitiveDataCodec;
@@ -159,11 +161,12 @@ public void testRunningSSL() throws Exception {
       env.put(Context.SECURITY_PRINCIPAL, PRINCIPAL);
       env.put(Context.SECURITY_CREDENTIALS, CREDENTIALS);
 
-      // Uncomment to enable SSL debugging
-      // System.setProperty("-Djavax.net.debug", "all");
-      System.setProperty("javax.net.ssl.trustStore", Objects.requireNonNull(this.getClass().
-         getClassLoader().getResource("server-ca-truststore.p12")).getFile());
-      System.setProperty("javax.net.ssl.trustStorePassword", "securepass");
+      SSLContext sslContext = new SSLSupport()
+         .setTruststorePath(Objects.requireNonNull(getClass().getClassLoader().getResource("server-ca-truststore.p12")).getFile())
+         .setTruststorePassword("securepass")
+         .createContext();
+      SSLContext previousDefault = SSLContext.getDefault();
+      SSLContext.setDefault(sslContext);
 
       DirContext ctx = null;
 
@@ -185,8 +188,7 @@ public void testRunningSSL() throws Exception {
          assertTrue(set.contains("ou=configuration"));
          assertTrue(set.contains("prefNodeName=sysPrefRoot"));
       } finally {
-         System.clearProperty("javax.net.ssl.trustStore");
-         System.clearProperty("javax.net.ssl.trustStorePassword");
+         SSLContext.setDefault(previousDefault);
 
          if (ctx != null) {
             ctx.close();
diff --git a/pom.xml b/pom.xml
index 9a50bd0cf76..551fe9ec589 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
       <elementary.version>3.0.0</elementary.version>
       <groovy.version>5.1.0</groovy.version>
       <hadoop.minikdc.version>3.5.0</hadoop.minikdc.version>
-      <mockserver.version>7.2.0</mockserver.version>
+      <mockserver.version>7.6.0</mockserver.version>
 
       <owasp.version>13.0.0</owasp.version>
       <spring.version>5.3.39</spring.version>