diff --git a/modules/solace/build.gradle b/modules/solace/build.gradle
index 5e023b07a67..8dd48e68f28 100644
--- a/modules/solace/build.gradle
+++ b/modules/solace/build.gradle
@@ -5,6 +5,9 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'com.solacesystems:sol-jcsmp:10.27.3'
     testImplementation 'org.apache.qpid:qpid-jms-client:0.61.0'
@@ -12,3 +15,7 @@ dependencies {
     testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.14'
 
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
index f7266fe8212..bb32b8abb57 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerAMQPTest.java
@@ -2,7 +2,7 @@
 
 import org.apache.qpid.jms.JmsConnectionFactory;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,7 +20,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolaceContainerAMQPTest {
+class SolaceContainerAMQPTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerAMQPTest.class);
 
@@ -29,7 +29,7 @@ public class SolaceContainerAMQPTest {
     private static final String TOPIC_NAME = "Topic/ActualTopic";
 
     @Test
-    public void testSolaceContainer() throws JMSException {
+    void testSolaceContainer() throws JMSException {
         try (
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.AMQP)
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
index 07c08d32416..a9990ab24f0 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerMQTTTest.java
@@ -7,7 +7,7 @@
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolaceContainerMQTTTest {
+class SolaceContainerMQTTTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerMQTTTest.class);
 
@@ -25,7 +25,7 @@ public class SolaceContainerMQTTTest {
     private static final String TOPIC_NAME = "Topic/ActualTopic";
 
     @Test
-    public void testSolaceContainer() {
+    void testSolaceContainer() {
         try (
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.MQTT)
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
index 7f54cec3f74..b23c24aa65d 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerRESTTest.java
@@ -13,20 +13,20 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolaceContainerRESTTest {
+class SolaceContainerRESTTest {
 
     private static final String MESSAGE = "HelloWorld";
 
     private static final String TOPIC_NAME = "Topic/ActualTopic";
 
     @Test
-    public void testSolaceContainer() throws IOException {
+    void testSolaceContainer() throws IOException {
         try (
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withTopic(TOPIC_NAME, Service.REST)
diff --git a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
index d7e0e8ea981..1036e8efb0a 100644
--- a/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
+++ b/modules/solace/src/test/java/org/testcontainers/solace/SolaceContainerSMFTest.java
@@ -15,7 +15,7 @@
 import com.solacesystems.jcsmp.XMLMessageListener;
 import com.solacesystems.jcsmp.XMLMessageProducer;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.utility.MountableFile;
@@ -25,7 +25,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SolaceContainerSMFTest {
+class SolaceContainerSMFTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SolaceContainerSMFTest.class);
 
@@ -36,7 +36,7 @@ public class SolaceContainerSMFTest {
     private static final Queue QUEUE = JCSMPFactory.onlyInstance().createQueue("Queue");
 
     @Test
-    public void testSolaceContainerWithSimpleAuthentication() {
+    void testSolaceContainerWithSimpleAuthentication() {
         try (
             // solaceContainerSetup {
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
@@ -54,7 +54,7 @@ public void testSolaceContainerWithSimpleAuthentication() {
     }
 
     @Test
-    public void testSolaceContainerWithCreateFlow() {
+    void testSolaceContainerWithCreateFlow() {
         try (
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")
                 .withCredentials("user", "pass")
@@ -87,7 +87,7 @@ private static void testCreateFlow(JCSMPSession session) {
     }
 
     @Test
-    public void testSolaceContainerWithCertificates() {
+    void testSolaceContainerWithCertificates() {
         try (
             // solaceContainerUsageSSL {
             SolaceContainer solaceContainer = new SolaceContainer("solace/solace-pubsub-standard:10.25.0")