diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle
index 49aad5f08a1..032d4a79e0a 100644
--- a/modules/mockserver/build.gradle
+++ b/modules/mockserver/build.gradle
@@ -3,6 +3,9 @@ description = "Testcontainers :: MockServer"
 dependencies {
     api project(':testcontainers')
 
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
     testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
     testImplementation 'org.assertj:assertj-core:3.27.4'
     testImplementation 'io.rest-assured:rest-assured:5.5.6'
@@ -13,3 +16,7 @@ tasks.japicmp {
         "org.testcontainers.containers.MockServerContainer"
     ]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
index 066b86b05fd..c01cad49479 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
@@ -1,7 +1,8 @@
 package org.testcontainers.containers;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.testcontainers.utility.DockerImageName;
 
@@ -10,20 +11,29 @@
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 
-public class MockServerContainerRuleTest {
+class MockServerContainerRuleTest {
 
     // creatingProxy {
-    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
+    private static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
         .parse("mockserver/mockserver")
         .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
 
-    @Rule
-    public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
+    private static MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
 
     // }
 
+    @BeforeAll
+    static void setup() {
+        mockServer.start();
+    }
+
+    @AfterAll
+    static void tearDown() {
+        mockServer.stop();
+    }
+
     @Test
-    public void shouldReturnExpectation() throws Exception {
+    void shouldReturnExpectation() {
         // testSimpleExpectation {
         try (
             MockServerClient mockServerClient = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
diff --git a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
index a06ea3e7e63..b1fca9ce514 100644
--- a/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
+++ b/modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java
@@ -3,7 +3,7 @@
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.config.SSLConfig;
 import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockserver.client.MockServerClient;
 import org.mockserver.configuration.Configuration;
 import org.mockserver.logging.MockServerLogger;
@@ -15,14 +15,14 @@
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 
-public class MockServerContainerTest {
+class MockServerContainerTest {
 
     public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
         .parse("mockserver/mockserver")
         .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
 
     @Test
-    public void shouldCallActualMockserverVersion() throws Exception {
+    void shouldCallActualMockserverVersion() throws Exception {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
 
@@ -41,7 +41,7 @@ public void shouldCallActualMockserverVersion() throws Exception {
     }
 
     @Test
-    public void shouldCallMockserverUsingTlsProtocol() throws Exception {
+    void shouldCallMockserverUsingTlsProtocol() throws Exception {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
 
@@ -63,7 +63,7 @@ public void shouldCallMockserverUsingTlsProtocol() throws Exception {
     }
 
     @Test
-    public void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
+    void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
         try (
             MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)
                 .withEnv("MOCKSERVER_TLS_MUTUAL_AUTHENTICATION_REQUIRED", "true")
@@ -88,7 +88,7 @@ public void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
     }
 
     @Test
-    public void newVersionStartsWithDefaultWaitStrategy() {
+    void newVersionStartsWithDefaultWaitStrategy() {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
         }