You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by he...@apache.org on 2026/04/15 10:43:05 UTC

(pekko-http) branch main updated: Migrate all Java unit tests from JUnit 4 to JUnit 5 (Jupiter) (#984)

This is an automated email from the ASF dual-hosted git repository.

hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-http.git


The following commit(s) were added to refs/heads/main by this push:
     new 2604f8a24 Migrate all Java unit tests from JUnit 4 to JUnit 5 (Jupiter) (#984)
2604f8a24 is described below

commit 2604f8a24d162c5e5da504639003be8eab7fabe2
Author: He-Pin(kerr) <he...@gmail.com>
AuthorDate: Wed Apr 15 18:42:59 2026 +0800

    Migrate all Java unit tests from JUnit 4 to JUnit 5 (Jupiter) (#984)
    
    * chore: Migrate all Java unit tests from JUnit 4 to JUnit 5 (Jupiter)
    
    - Migrate 94 Java test files across all modules (docs, http-core,
      http-tests, http-marshallers-java, http2-tests, http-testkit)
    - Add JUnit 5 dependencies (5.9.3) and sbt-jupiter-interface plugin (0.11.0)
    - Create JUnit5RouteTest and ActorSystemExtension for JUnit 5 lifecycle
    - Convert @Test(expected=...) to assertThrows()
    - Reorder 3-arg assertion messages (JUnit 4 → JUnit 5 convention)
    - Convert @Ignore to @Disabled, @Before/@After to @BeforeEach/@AfterEach
    - Delete AllJavaTests.java (JUnit 4 Suite runner, replaced by auto-discovery)
    - Fix pre-existing printStackTrace() in Http2ClientApp.java
    - Preserve JUnitRouteTest and ActorSystemResource for library users (JUnit 4 API)
    - Run scalafmtAll and javafmtAll for formatting compliance
    
    All tests pass: http-testkit(23), http-core(1159), http-tests(1483),
    marshallers(6), http2(337), docs(509/510 - 1 pre-existing port conflict)
    
    Cross-reviewed by GPT-5.4, Gemini 3 Pro, and Claude Opus 4.6 - all approved.
    
    * fix: address review comments on JUnit 5 migration PR
    
    - Update sbt-jupiter-interface from 0.11.0 to 0.18.0 with new org
      (net.aichler -> com.github.sbt.junit)
    - Remove redundant testFrameworks line (plugin handles this)
    - Add JUnitJupiterRouteTest and deprecate JUnit5RouteTest
    - Update ActorSystemExtension doc to reference new class name
    
    🤖 Generated with [Qoder][https://qoder.com]
    
    * refactor: rename JUnit5RouteTest to JUnitJupiterRouteTest everywhere
    
    ---------
    
    Co-authored-by: hepin <he...@apache.org>
---
 .../docs/http/javadsl/CustomHeaderExampleTest.java |  12 +-
 .../http/javadsl/CustomMediaTypesExampleTest.java  |   8 +-
 .../http/javadsl/CustomStatusCodesExampleTest.java |   8 +-
 .../java/docs/http/javadsl/Http2ClientApp.java     |   2 +-
 .../HttpRequestDetailedStringExampleTest.java      |   4 +-
 .../HttpResponseDetailedStringExampleTest.java     |   6 +-
 .../docs/http/javadsl/JacksonXmlExampleTest.java   |   8 +-
 .../test/java/docs/http/javadsl/ModelDocTest.java  |   4 +-
 .../RespondWithHeaderHandlerExampleTest.java       |   6 +-
 .../test/java/docs/http/javadsl/UnmarshalTest.java |   8 +-
 .../javadsl/server/BlockingInHttpExamples.java     |   6 +-
 .../http/javadsl/server/DirectiveExamplesTest.java |   6 +-
 .../javadsl/server/FileUploadExamplesTest.java     |   6 +-
 .../server/FormFieldRequestValsExampleTest.java    |   6 +-
 .../server/HeaderRequestValsExampleTest.java       |   6 +-
 .../server/HttpBasicAuthenticatorExample.java      |   6 +-
 .../javadsl/server/HttpsServerExampleTest.java     |   5 +-
 .../javadsl/server/JsonStreamingExamplesTest.java  |   6 +-
 .../javadsl/server/OAuth2AuthenticatorExample.java |   6 +-
 .../javadsl/server/PathDirectiveExampleTest.java   |   6 +-
 .../server/RejectionHandlerExamplesTest.java       |   6 +-
 .../AttributeDirectivesExamplesTest.java           |   6 +-
 .../directives/BasicDirectivesExamplesTest.java    |  16 +-
 .../directives/CachingDirectivesExamplesTest.java  |   8 +-
 .../directives/CodingDirectivesExamplesTest.java   |   6 +-
 .../directives/CookieDirectivesExamplesTest.java   |   6 +-
 .../directives/CustomDirectivesExamplesTest.java   |   6 +-
 .../directives/CustomHttpMethodExamplesTest.java   |   8 +-
 .../DebuggingDirectivesExamplesTest.java           |   6 +-
 .../ExecutionDirectivesExamplesTest.java           |   6 +-
 .../FileAndResourceDirectivesExamplesTest.java     |  22 +-
 .../FileUploadDirectivesExamplesTest.java          |  10 +-
 .../FormFieldDirectivesExamplesTest.java           |   6 +-
 .../directives/FutureDirectivesExamplesTest.java   |  10 +-
 .../directives/HeaderDirectivesExamplesTest.java   |   6 +-
 .../directives/HostDirectivesExamplesTest.java     |  31 +--
 .../MarshallingDirectivesExamplesTest.java         |   6 +-
 .../directives/MethodDirectivesExamplesTest.java   |   6 +-
 .../directives/MiscDirectivesExamplesTest.java     |   6 +-
 .../ParameterDirectivesExamplesTest.java           |   6 +-
 .../directives/PathDirectivesExamplesTest.java     |   6 +-
 .../directives/RangeDirectivesExamplesTest.java    |  10 +-
 .../RespondWithDirectivesExamplesTest.java         |   6 +-
 .../directives/RouteDirectivesExamplesTest.java    |   6 +-
 .../directives/SchemeDirectivesExamplesTest.java   |   6 +-
 .../directives/SecurityDirectivesExamplesTest.java |   6 +-
 .../directives/TimeoutDirectivesExamplesTest.java  |  10 +-
 .../WebSocketDirectivesExamplesTest.java           |   6 +-
 .../server/testkit/PlayRoutesComparisonTest.java   |   6 +-
 .../server/testkit/TestKitFragmentTest.java        |   6 +-
 .../server/testkit/TestKitWithActorTest.java       |   6 +-
 .../javadsl/server/testkit/TestkitExampleTest.java |   6 +-
 .../javadsl/server/testkit/WithTimeoutTest.java    |   6 +-
 .../http/javadsl/model/EntityDiscardingTest.java   |   7 +-
 .../pekko/http/javadsl/model/HttpMessageTest.java  |   9 +-
 .../apache/pekko/http/javadsl/model/UriTest.java   | 235 +++++++++++++--------
 .../javadsl/model/sse/ServerSentEventTest.java     |  37 ++--
 .../settings/ClientConnectionSettingsTest.java     |   5 +-
 .../settings/ConnectionPoolSettingsTest.java       |   5 +-
 .../http/javadsl/settings/ParserSettingsTest.java  |   5 +-
 .../http/javadsl/settings/ServerSettingsTest.java  |   5 +-
 .../javadsl/marshallers/jackson/JacksonTest.java   |   8 +-
 .../javadsl/marshallers/jackson3/JacksonTest.java  |  13 +-
 .../javadsl/testkit/ActorSystemExtension.scala     |  61 ++++++
 .../javadsl/testkit/JUnitJupiterRouteTest.scala    |  95 +++++++++
 .../http/javadsl/testkit/JUnitRouteTestTest.java   |   4 +-
 http-tests/src/test/java/AllJavaTests.java         |  21 --
 .../http/javadsl/server/HandlerExampleDocTest.java |   6 +-
 .../apache/pekko/http/javadsl/HttpAPIsTest.java    |   6 +-
 .../sse/EventStreamMarshallingTest.java            |   6 +-
 .../pekko/http/javadsl/server/CompleteTest.java    |   6 +-
 .../http/javadsl/server/HandlerBindingTest.java    |   6 +-
 .../pekko/http/javadsl/server/JavaRouteTest.java   |   6 +-
 .../pekko/http/javadsl/server/MarshallerTest.java  |   6 +-
 .../http/javadsl/server/UnmarshallerTest.java      |   8 +-
 .../server/directives/AttributeDirectivesTest.java |   6 +-
 .../server/directives/CodingDirectivesTest.java    |   9 +-
 .../server/directives/ComposingDirectivesTest.java |   6 +-
 .../server/directives/CookieDirectivesTest.java    |   6 +-
 .../server/directives/ExecutionDirectivesTest.java |   6 +-
 .../server/directives/HeaderDirectivesTest.java    |   6 +-
 .../server/directives/HostDirectivesTest.java      |   6 +-
 .../directives/MarshallingDirectivesTest.java      |   6 +-
 .../server/directives/MiscDirectivesTest.java      |   6 +-
 .../server/directives/ParameterDirectivesTest.java |   6 +-
 .../server/directives/PathDirectivesTest.java      |   6 +-
 .../server/directives/RouteDirectivesTest.java     |  15 +-
 .../server/directives/SchemeDirectivesTest.java    |   6 +-
 .../server/directives/SecurityDirectivesTest.java  |   4 +-
 .../server/examples/petstore/PetStoreAPITest.java  |   6 +-
 .../server/examples/simple/SimpleServerTest.java   |   4 +-
 .../http/javadsl/server/values/FormFieldsTest.java |   6 +-
 .../http/javadsl/server/values/HeadersTest.java    |   6 +-
 .../settings/OversizedSseStrategySimpleTest.java   |  17 +-
 .../http/javadsl/settings/RoutingSettingsTest.java |   5 +-
 .../sse/EventStreamUnmarshallingOversizedTest.java |  41 ++--
 .../sse/EventStreamUnmarshallingTest.java          |   9 +-
 project/Dependencies.scala                         |  38 +++-
 project/plugins.sbt                                |   1 +
 99 files changed, 694 insertions(+), 487 deletions(-)

diff --git a/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java b/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java
index 56c96d07a..07e933f4e 100644
--- a/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java
@@ -20,14 +20,14 @@ import org.apache.pekko.http.javadsl.model.headers.ModeledCustomHeader;
 import org.apache.pekko.http.javadsl.model.headers.ModeledCustomHeaderFactory;
 import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.japi.JavaPartialFunction;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import scala.PartialFunction;
 
 import java.util.Optional;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 // #header-value-pf
 import org.apache.pekko.http.javadsl.server.Directives;
@@ -36,7 +36,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.headerValuePF;
 
 // #header-value-pf
 
-public class CustomHeaderExampleTest extends JUnitRouteTest {
+public class CustomHeaderExampleTest extends JUnitJupiterRouteTest {
   // #modeled-api-key-custom-header
   public static class ApiTokenHeader extends ModeledCustomHeader {
 
@@ -79,14 +79,14 @@ public class CustomHeaderExampleTest extends JUnitRouteTest {
 
     final Optional<ApiTokenHeader> fromRaw =
         apiTokenHeaderFactory.from(RawHeader.create("apiKey", "token"));
-    assertTrue("Expected a header", fromRaw.isPresent());
+    assertTrue(fromRaw.isPresent(), "Expected a header");
     assertEquals("apiKey", fromRaw.get().name());
     assertEquals("token", fromRaw.get().value());
 
     // will match, header keys are case insensitive
     final Optional<ApiTokenHeader> fromRawUpper =
         apiTokenHeaderFactory.from(RawHeader.create("APIKEY", "token"));
-    assertTrue("Expected a header", fromRawUpper.isPresent());
+    assertTrue(fromRawUpper.isPresent(), "Expected a header");
     assertEquals("apiKey", fromRawUpper.get().name());
     assertEquals("token", fromRawUpper.get().value());
 
diff --git a/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java b/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java
index 6f0049b68..35d231564 100644
--- a/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java
@@ -25,14 +25,14 @@ import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.settings.ParserSettings;
 import org.apache.pekko.http.javadsl.settings.ServerSettings;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.apache.pekko.util.ByteString.emptyByteString;
 
 // #application-custom-java
@@ -41,7 +41,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.extractRequest;
 
 // #application-custom-java
 
-public class CustomMediaTypesExampleTest extends JUnitRouteTest {
+public class CustomMediaTypesExampleTest extends JUnitJupiterRouteTest {
 
   @Test
   public void customMediaTypes() throws ExecutionException, InterruptedException {
diff --git a/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java b/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java
index 29d9f84f3..1df1d5178 100644
--- a/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java
@@ -26,16 +26,16 @@ import org.apache.pekko.http.javadsl.settings.ClientConnectionSettings;
 import org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings;
 import org.apache.pekko.http.javadsl.settings.ParserSettings;
 import org.apache.pekko.http.javadsl.settings.ServerSettings;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.stream.Materializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.net.ssl.SSLContext;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // #application-custom-java
 import static org.apache.pekko.http.javadsl.server.Directives.complete;
@@ -43,7 +43,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.extractRequest;
 
 // #application-custom-java
 
-public class CustomStatusCodesExampleTest extends JUnitRouteTest {
+public class CustomStatusCodesExampleTest extends JUnitJupiterRouteTest {
 
   @Test
   public void customStatusCodes()
diff --git a/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java b/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
index 045339077..2eaef03d5 100644
--- a/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
+++ b/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
@@ -111,7 +111,7 @@ public class Http2ClientApp {
                             res.getAttribute(ResponseFuture.KEY()).get();
                         responseFuture.future().complete(res);
                       } catch (Exception ex) {
-                        ex.printStackTrace();
+                        system.log().error(ex, "Error processing HTTP/2 response");
                       }
                     }))
             .run(SystemMaterializer.get(system).materializer());
diff --git a/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java b/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
index ef2c31fe6..fd72b1a55 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
@@ -15,8 +15,8 @@ package docs.http.javadsl;
 
 import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.model.headers.Authorization;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
 
diff --git a/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java b/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
index 5d971131b..26d46ecfc 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
@@ -15,12 +15,12 @@ package docs.http.javadsl;
 
 import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.model.headers.Authorization;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class HttpResponseDetailedStringExampleTest {
 
diff --git a/docs/src/test/java/docs/http/javadsl/JacksonXmlExampleTest.java b/docs/src/test/java/docs/http/javadsl/JacksonXmlExampleTest.java
index b7e5a8f70..edc5cb52e 100644
--- a/docs/src/test/java/docs/http/javadsl/JacksonXmlExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/JacksonXmlExampleTest.java
@@ -13,21 +13,21 @@
 
 package docs.http.javadsl;
 
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import com.fasterxml.jackson.annotation.JsonRootName;
 
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class JacksonXmlExampleTest extends JUnitRouteTest {
+public class JacksonXmlExampleTest extends JUnitJupiterRouteTest {
 
   final String xml = "<point><x>3</x><y>4</y></point>";
   final Point point =
diff --git a/docs/src/test/java/docs/http/javadsl/ModelDocTest.java b/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
index e9a9d6f9b..4e9bd2c85 100644
--- a/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
+++ b/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
@@ -14,8 +14,8 @@
 package docs.http.javadsl;
 
 import org.apache.pekko.util.ByteString;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // #import-model
 import org.apache.pekko.http.javadsl.model.*;
diff --git a/docs/src/test/java/docs/http/javadsl/RespondWithHeaderHandlerExampleTest.java b/docs/src/test/java/docs/http/javadsl/RespondWithHeaderHandlerExampleTest.java
index b8786c22a..92d6d5c4f 100644
--- a/docs/src/test/java/docs/http/javadsl/RespondWithHeaderHandlerExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/RespondWithHeaderHandlerExampleTest.java
@@ -24,11 +24,11 @@ import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 import org.apache.pekko.http.javadsl.server.AllDirectives;
 import org.apache.pekko.http.javadsl.server.ExceptionHandler;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.http.scaladsl.model.ErrorInfo;
 import org.apache.pekko.http.scaladsl.model.IllegalHeaderException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.concurrent.CompletionStage;
@@ -39,7 +39,7 @@ import static junit.framework.TestCase.assertTrue;
 // #no-exception-details-in-response
 // #no-exception-details-in-response
 
-public class RespondWithHeaderHandlerExampleTest extends JUnitRouteTest {
+public class RespondWithHeaderHandlerExampleTest extends JUnitJupiterRouteTest {
 
   @Test
   public void compileOnlySpec() throws Exception {
diff --git a/docs/src/test/java/docs/http/javadsl/UnmarshalTest.java b/docs/src/test/java/docs/http/javadsl/UnmarshalTest.java
index b58c32acc..dedab7dfc 100644
--- a/docs/src/test/java/docs/http/javadsl/UnmarshalTest.java
+++ b/docs/src/test/java/docs/http/javadsl/UnmarshalTest.java
@@ -13,10 +13,10 @@
 
 package docs.http.javadsl;
 
-import static org.junit.Assert.assertEquals;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // #imports
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
 // #imports
 
 @SuppressWarnings("unused")
-public class UnmarshalTest extends JUnitRouteTest {
+public class UnmarshalTest extends JUnitJupiterRouteTest {
 
   @Test
   public void useUnmarshal() throws Exception {
diff --git a/docs/src/test/java/docs/http/javadsl/server/BlockingInHttpExamples.java b/docs/src/test/java/docs/http/javadsl/server/BlockingInHttpExamples.java
index 57302c85a..e7c1cd2dd 100644
--- a/docs/src/test/java/docs/http/javadsl/server/BlockingInHttpExamples.java
+++ b/docs/src/test/java/docs/http/javadsl/server/BlockingInHttpExamples.java
@@ -17,8 +17,8 @@ import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.dispatch.MessageDispatcher;
 import org.apache.pekko.http.javadsl.model.HttpResponse;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -32,7 +32,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.completeWithFuture
 import static org.apache.pekko.http.javadsl.server.Directives.post;
 
 // #blocking-example-in-dedicated-dispatcher
-public class BlockingInHttpExamples extends JUnitRouteTest {
+public class BlockingInHttpExamples extends JUnitJupiterRouteTest {
 
   @Test
   public void compileOnlySpec() throws Exception {
diff --git a/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java
index a95a30868..99adda0d1 100644
--- a/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java
@@ -15,8 +15,8 @@ package docs.http.javadsl.server;
 
 import org.apache.pekko.http.javadsl.model.RemoteAddress;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -86,7 +86,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 // #allOf
 
-public class DirectiveExamplesTest extends JUnitRouteTest {
+public class DirectiveExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void compileOnlySpec() throws Exception {
diff --git a/docs/src/test/java/docs/http/javadsl/server/FileUploadExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/FileUploadExamplesTest.java
index 75743fb5d..7d819dbbd 100644
--- a/docs/src/test/java/docs/http/javadsl/server/FileUploadExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/FileUploadExamplesTest.java
@@ -17,7 +17,7 @@ import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.Materializer;
@@ -26,7 +26,7 @@ import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Framing;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.util.ByteString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.Serializable;
@@ -56,7 +56,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 // #stream-csv-upload
 
-public class FileUploadExamplesTest extends JUnitRouteTest {
+public class FileUploadExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void compileOnlySpec() throws Exception {
diff --git a/docs/src/test/java/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
index b90166424..c3d8a9594 100644
--- a/docs/src/test/java/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
@@ -13,7 +13,7 @@
 
 package docs.http.javadsl.server;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.FormData;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
@@ -21,7 +21,7 @@ import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshaller;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.japi.Pair;
 
 // #simple
@@ -35,7 +35,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.formField;
 
 // #custom-unmarshal
 
-public class FormFieldRequestValsExampleTest extends JUnitRouteTest {
+public class FormFieldRequestValsExampleTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testFormFieldVals() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/HeaderRequestValsExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/HeaderRequestValsExampleTest.java
index 4f4880c0f..6271091c7 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HeaderRequestValsExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HeaderRequestValsExampleTest.java
@@ -13,13 +13,13 @@
 
 package docs.http.javadsl.server;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.headers.Host;
 import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
 // #by-class
 import static org.apache.pekko.http.javadsl.server.Directives.extractHost;
@@ -32,7 +32,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.complete;
 
 // #by-name
 
-public class HeaderRequestValsExampleTest extends JUnitRouteTest {
+public class HeaderRequestValsExampleTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testHeaderVals() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java b/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
index cb125596f..3453961c5 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
@@ -15,13 +15,13 @@ package docs.http.javadsl.server;
 
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.headers.Host;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.scaladsl.model.headers.Authorization;
 
 // #basic-authenticator-java
@@ -30,7 +30,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.complete;
 
 // #basic-authenticator-java
 
-public class HttpBasicAuthenticatorExample extends JUnitRouteTest {
+public class HttpBasicAuthenticatorExample extends JUnitJupiterRouteTest {
 
   private final String hardcodedPassword = "correcthorsebatterystaple";
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/HttpsServerExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/HttpsServerExampleTest.java
index e4c741d11..4dd57aee6 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HttpsServerExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HttpsServerExampleTest.java
@@ -15,14 +15,13 @@ package docs.http.javadsl.server;
 
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.http.javadsl.ConnectionContext;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 
 /* COMPILE ONLY TEST */
-public class HttpsServerExampleTest extends JUnitSuite {
+public class HttpsServerExampleTest {
 
   @Test
   public void compileOnlySpec() throws Exception {
diff --git a/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
index 93d6ca6fc..094b9e63b 100644
--- a/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
@@ -21,7 +21,7 @@ import org.apache.pekko.http.javadsl.marshalling.Marshaller;
 import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.model.headers.Accept;
 import org.apache.pekko.http.javadsl.server.*;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
 import org.apache.pekko.http.javadsl.common.EntityStreamingSupport;
@@ -29,7 +29,7 @@ import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletionStage;
 
@@ -54,7 +54,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 import static org.apache.pekko.http.javadsl.server.Directives.completeWithSource;
 
 // #csv-example
-public class JsonStreamingExamplesTest extends JUnitRouteTest {
+public class JsonStreamingExamplesTest extends JUnitJupiterRouteTest {
 
   // #routes
   final Route tweets() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java b/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
index eb651155b..8b1d3b58c 100644
--- a/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
@@ -16,12 +16,12 @@ package docs.http.javadsl.server;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.headers.Host;
 import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.scaladsl.model.headers.Authorization;
 
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // #oauth2-authenticator-java
 import org.apache.pekko.http.javadsl.server.Route;
@@ -31,7 +31,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.authenticateOAuth2
 
 // #oauth2-authenticator-java
 
-public class OAuth2AuthenticatorExample extends JUnitRouteTest {
+public class OAuth2AuthenticatorExample extends JUnitJupiterRouteTest {
 
   private final String hardcodedToken = "token";
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/PathDirectiveExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/PathDirectiveExampleTest.java
index 15dc99c92..d9b6b063f 100644
--- a/docs/src/test/java/docs/http/javadsl/server/PathDirectiveExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/PathDirectiveExampleTest.java
@@ -15,8 +15,8 @@ package docs.http.javadsl.server;
 
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.PathMatchers;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 // #path-examples
 import static org.apache.pekko.http.javadsl.server.Directives.complete;
@@ -26,7 +26,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
 import static org.apache.pekko.http.javadsl.server.Directives.pathSingleSlash;
 // #path-examples
 
-public class PathDirectiveExampleTest extends JUnitRouteTest {
+public class PathDirectiveExampleTest extends JUnitJupiterRouteTest {
   @Test
   public void testPathPrefix() {
     // #path-examples
diff --git a/docs/src/test/java/docs/http/javadsl/server/RejectionHandlerExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/RejectionHandlerExamplesTest.java
index 9b9df8022..72c6d6cf7 100644
--- a/docs/src/test/java/docs/http/javadsl/server/RejectionHandlerExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/RejectionHandlerExamplesTest.java
@@ -24,8 +24,8 @@ import org.apache.pekko.http.javadsl.server.MissingCookieRejection;
 import org.apache.pekko.http.javadsl.server.RejectionHandler;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.server.ValidationRejection;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Collectors;
 
@@ -49,7 +49,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.handleRejections;
 import static org.apache.pekko.http.javadsl.server.Directives.validate;
 
 // #example-json
-public class RejectionHandlerExamplesTest extends JUnitRouteTest {
+public class RejectionHandlerExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void compileOnlySpec() throws Exception {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/AttributeDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/AttributeDirectivesExamplesTest.java
index 26b800472..d9da4ce68 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/AttributeDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/AttributeDirectivesExamplesTest.java
@@ -17,10 +17,10 @@ import org.apache.pekko.http.javadsl.model.AttributeKey;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
-public class AttributeDirectivesExamplesTest extends JUnitRouteTest {
+public class AttributeDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void attribute() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
index fb520207a..0f249a284 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
@@ -29,15 +29,15 @@ import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 import org.apache.pekko.http.javadsl.model.headers.Server;
 import org.apache.pekko.http.javadsl.model.headers.ProductVersion;
 import org.apache.pekko.http.javadsl.settings.RoutingSettings;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.server.*;
 import org.apache.pekko.japi.pf.PFBuilder;
 import org.apache.pekko.stream.Materializer;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import scala.concurrent.ExecutionContext;
 import scala.concurrent.ExecutionContextExecutor;
 
@@ -256,7 +256,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.extractActorSystem
 
 // #extractActorSystem
 
-public class BasicDirectivesExamplesTest extends JUnitRouteTest {
+public class BasicDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testExtract() {
@@ -438,7 +438,7 @@ public class BasicDirectivesExamplesTest extends JUnitRouteTest {
     // #withLog
   }
 
-  @Ignore("Ignore compile-only test")
+  @Disabled("Ignore compile-only test")
   @Test
   public void testWithSettings() {
     // #withSettings
@@ -628,7 +628,7 @@ public class BasicDirectivesExamplesTest extends JUnitRouteTest {
     // #mapResponseHeaders
   }
 
-  @Ignore("Not implemented yet")
+  @Disabled("Not implemented yet")
   @Test
   public void testMapInnerRoute() {
     // #mapInnerRoute
@@ -903,7 +903,7 @@ public class BasicDirectivesExamplesTest extends JUnitRouteTest {
     // #provide
   }
 
-  @Ignore("Test failed")
+  @Disabled("Test failed")
   @Test
   public void testCancelRejections() {
     // #cancelRejections
@@ -915,7 +915,7 @@ public class BasicDirectivesExamplesTest extends JUnitRouteTest {
     // #cancelRejections
   }
 
-  @Ignore("Test failed")
+  @Disabled("Test failed")
   @Test
   public void testCancelRejection() {
     // #cancelRejection
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CachingDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CachingDirectivesExamplesTest.java
index 6b75c6437..53f9c09a0 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CachingDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CachingDirectivesExamplesTest.java
@@ -30,9 +30,9 @@ import static org.apache.pekko.http.javadsl.server.directives.CachingDirectives.
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 // #time-unit-import
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.pekko.http.javadsl.server.RouteResult;
 // #create-cache-imports
@@ -49,7 +49,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 // #cache
 
-public class CachingDirectivesExamplesTest extends JUnitRouteTest {
+public class CachingDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testCache() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
index be0b2e121..839a13993 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
@@ -23,9 +23,9 @@ import org.apache.pekko.http.javadsl.model.headers.HttpEncodings;
 import org.apache.pekko.http.javadsl.coding.Coder;
 import org.apache.pekko.http.javadsl.server.Rejections;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.util.ByteString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 
@@ -64,7 +64,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.withPrecompressedM
 
 // #withPrecompressedMediaTypeSupport
 
-public class CodingDirectivesExamplesTest extends JUnitRouteTest {
+public class CodingDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testResponseEncodingAccepted() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CookieDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CookieDirectivesExamplesTest.java
index a9c9c1910..cebf6d6d8 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CookieDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CookieDirectivesExamplesTest.java
@@ -20,9 +20,9 @@ import org.apache.pekko.http.javadsl.model.headers.HttpCookie;
 import org.apache.pekko.http.javadsl.model.headers.SetCookie;
 import org.apache.pekko.http.javadsl.server.Rejections;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.scaladsl.model.DateTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.OptionalLong;
@@ -47,7 +47,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.complete;
 import static org.apache.pekko.http.javadsl.server.Directives.setCookie;
 
 // #setCookie
-public class CookieDirectivesExamplesTest extends JUnitRouteTest {
+public class CookieDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testCookie() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
index d167d1be0..2c183caec 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
@@ -17,8 +17,8 @@ import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -42,7 +42,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 // #composition-2
 
-public class CustomDirectivesExamplesTest extends JUnitRouteTest {
+public class CustomDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   // #labeling-1
   public Route getOrPut(Supplier<Route> inner) {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CustomHttpMethodExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CustomHttpMethodExamplesTest.java
index 017d199b5..609bef8fd 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CustomHttpMethodExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CustomHttpMethodExamplesTest.java
@@ -23,10 +23,10 @@ import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.settings.ParserSettings;
 import org.apache.pekko.http.javadsl.settings.ServerSettings;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.stream.javadsl.Flow;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
@@ -41,7 +41,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.complete;
 import static org.apache.pekko.http.javadsl.server.Directives.extractMethod;
 
 // #customHttpMethod
-public class CustomHttpMethodExamplesTest extends JUnitRouteTest {
+public class CustomHttpMethodExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testComposition() throws InterruptedException, ExecutionException, TimeoutException {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/DebuggingDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/DebuggingDirectivesExamplesTest.java
index d86daea17..62d749141 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/DebuggingDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/DebuggingDirectivesExamplesTest.java
@@ -13,12 +13,12 @@
 
 package docs.http.javadsl.server.directives;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.HttpResponse;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
 import java.util.function.Function;
 import java.util.function.BiFunction;
@@ -49,7 +49,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.logResult;
 
 // #logResult
 
-public class DebuggingDirectivesExamplesTest extends JUnitRouteTest {
+public class DebuggingDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testLogRequest() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/ExecutionDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/ExecutionDirectivesExamplesTest.java
index a05ebfd31..4c8fd080b 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/ExecutionDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/ExecutionDirectivesExamplesTest.java
@@ -21,8 +21,8 @@ import org.apache.pekko.http.javadsl.server.RejectionHandler;
 import org.apache.pekko.http.javadsl.server.Rejections;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.server.ValidationRejection;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
 
@@ -51,7 +51,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.reject;
 
 // #handleNotFoundWithDefails
 
-public class ExecutionDirectivesExamplesTest extends JUnitRouteTest {
+public class ExecutionDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testHandleExceptions() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FileAndResourceDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FileAndResourceDirectivesExamplesTest.java
index 396725756..ac0a71bb1 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FileAndResourceDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FileAndResourceDirectivesExamplesTest.java
@@ -18,9 +18,9 @@ import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.PathMatchers;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.server.directives.DirectoryRenderer;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import scala.NotImplementedError;
 
 import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
@@ -63,9 +63,9 @@ import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
 
 // #getFromResourceDirectory
 
-public class FileAndResourceDirectivesExamplesTest extends JUnitRouteTest {
+public class FileAndResourceDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
-  @Ignore("Compile only test")
+  @Disabled("Compile only test")
   @Test
   public void testGetFromFile() {
     // #getFromFile
@@ -77,7 +77,7 @@ public class FileAndResourceDirectivesExamplesTest extends JUnitRouteTest {
     // #getFromFile
   }
 
-  @Ignore("Compile only test")
+  @Disabled("Compile only test")
   @Test
   public void testGetFromResource() {
     // #getFromResource
@@ -89,7 +89,7 @@ public class FileAndResourceDirectivesExamplesTest extends JUnitRouteTest {
     // #getFromResource
   }
 
-  @Ignore("Compile only test")
+  @Disabled("Compile only test")
   @Test
   public void testListDirectoryContents() {
     // #listDirectoryContents
@@ -112,7 +112,7 @@ public class FileAndResourceDirectivesExamplesTest extends JUnitRouteTest {
     // #listDirectoryContents
   }
 
-  @Ignore("Compile only test")
+  @Disabled("Compile only test")
   @Test
   public void testGetFromBrowseableDirectory() {
     // #getFromBrowseableDirectory
@@ -123,7 +123,7 @@ public class FileAndResourceDirectivesExamplesTest extends JUnitRouteTest {
     // #getFromBrowseableDirectory
   }
 
-  @Ignore("Compile only test")
+  @Disabled("Compile only test")
   @Test
   public void testGetFromBrowseableDirectories() {
     // #getFromBrowseableDirectories
@@ -134,7 +134,7 @@ public class FileAndResourceDirectivesExamplesTest extends JUnitRouteTest {
     // #getFromBrowseableDirectories
   }
 
-  @Ignore("Compile only test")
+  @Disabled("Compile only test")
   @Test
   public void testGetFromDirectory() {
     // #getFromDirectory
@@ -145,7 +145,7 @@ public class FileAndResourceDirectivesExamplesTest extends JUnitRouteTest {
     // #getFromDirectory
   }
 
-  @Ignore("Compile only test")
+  @Disabled("Compile only test")
   @Test
   public void testGetFromResourceDirectory() {
     // #getFromResourceDirectory
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
index 332d52252..79dbc39b7 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
@@ -18,12 +18,12 @@ import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 import org.apache.pekko.http.javadsl.server.directives.FileInfo;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.stream.javadsl.Framing;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import scala.concurrent.duration.FiniteDuration;
 
 import java.io.File;
@@ -62,7 +62,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.onSuccess;
 
 // #fileUploadAll
 
-public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
+public class FileUploadDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Override
   public FiniteDuration defaultAwaitDuration() {
@@ -265,7 +265,7 @@ public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
     // #fileUploadAll
   }
 
-  @Ignore("compileOnly")
+  @Disabled("compileOnly")
   @Test
   public void testFileProcessing() {
     // #fileProcessing
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java
index 2b7719e2e..5d43ea1ff 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java
@@ -18,9 +18,9 @@ import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.japi.Pair;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -52,7 +52,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.formFieldMultiMap;
 
 // #formFieldMultiMap
 
-public class FormFieldDirectivesExamplesTest extends JUnitRouteTest {
+public class FormFieldDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testFormField() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
index bcd878781..9ea3b1588 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
@@ -20,13 +20,13 @@ import java.util.concurrent.TimeUnit;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.marshalling.Marshaller;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.scaladsl.model.StatusCodes;
 import org.apache.pekko.japi.pf.PFBuilder;
 import org.apache.pekko.pattern.CircuitBreaker;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
 
@@ -53,7 +53,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 // #onCompleteWithBreaker
 
-public class FutureDirectivesExamplesTest extends JUnitRouteTest {
+public class FutureDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testOnComplete() {
@@ -156,7 +156,7 @@ public class FutureDirectivesExamplesTest extends JUnitRouteTest {
   // relationships
   // between triggering and reporting errors for ongoing calls. This test fails a lot so disabling
   // for now.
-  @Ignore
+  @Disabled
   @Test
   public void testOnCompleteWithBreaker() throws InterruptedException {
     // #onCompleteWithBreaker
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/HeaderDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/HeaderDirectivesExamplesTest.java
index b0ae37677..408d4ec51 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/HeaderDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/HeaderDirectivesExamplesTest.java
@@ -16,7 +16,7 @@ package docs.http.javadsl.server.directives;
 import java.util.Optional;
 import java.util.function.Function;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpHeader;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
@@ -27,7 +27,7 @@ import org.apache.pekko.http.javadsl.model.headers.HttpOriginRange;
 import org.apache.pekko.http.javadsl.model.headers.Origin;
 import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.japi.JavaPartialFunction;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import scala.PartialFunction;
@@ -86,7 +86,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.checkSameOrigin;
 
 // #checkSameOrigin
 
-public class HeaderDirectivesExamplesTest extends JUnitRouteTest {
+public class HeaderDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testHeaderValue() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
index b846da966..51067e710 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
@@ -16,13 +16,14 @@ package docs.http.javadsl.server.directives;
 import java.util.Arrays;
 import java.util.regex.Pattern;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.model.headers.Host;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
 // #host1
 import static org.apache.pekko.http.javadsl.server.Directives.complete;
@@ -46,7 +47,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.host;
 
 // #matchAndExtractHost
 
-public class HostDirectivesExamplesTest extends JUnitRouteTest {
+public class HostDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testListOfHost() {
@@ -115,16 +116,20 @@ public class HostDirectivesExamplesTest extends JUnitRouteTest {
   }
 
   @SuppressWarnings("unused")
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testFailingMatchAndExtractHost() {
-    // #failing-matchAndExtractHost
-    // this will throw IllegalArgumentException
-    final Route hostRegex =
-        host(
-            Pattern.compile("server-([0-9]).company.(com|net|org)"),
-            s ->
-                // will not reach here
-                complete(s));
-    // #failing-matchAndExtractHost
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          // #failing-matchAndExtractHost
+          // this will throw IllegalArgumentException
+          final Route hostRegex =
+              host(
+                  Pattern.compile("server-([0-9]).company.(com|net|org)"),
+                  s ->
+                      // will not reach here
+                      complete(s));
+          // #failing-matchAndExtractHost
+        });
   }
 }
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/MarshallingDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/MarshallingDirectivesExamplesTest.java
index b88694861..7b85feeac 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/MarshallingDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/MarshallingDirectivesExamplesTest.java
@@ -17,10 +17,10 @@ import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
 import org.apache.pekko.http.javadsl.marshalling.Marshaller;
 import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -39,7 +39,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.handleWith;
 
 // #example-handleWith-with-json
 
-public class MarshallingDirectivesExamplesTest extends JUnitRouteTest {
+public class MarshallingDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   // #person
   public static class Person {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/MethodDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/MethodDirectivesExamplesTest.java
index 1819ef857..934e49586 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/MethodDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/MethodDirectivesExamplesTest.java
@@ -13,13 +13,13 @@
 
 package docs.http.javadsl.server.directives;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpMethods;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
 // #delete
 import static org.apache.pekko.http.javadsl.server.Directives.complete;
@@ -70,7 +70,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.overrideMethodWith
 
 // #overrideMethodWithParameter
 
-public class MethodDirectivesExamplesTest extends JUnitRouteTest {
+public class MethodDirectivesExamplesTest extends JUnitJupiterRouteTest {
   @Test
   public void testDelete() {
     // #delete
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
index 814c9475d..7a5f761df 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
@@ -18,9 +18,9 @@ import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.model.headers.*;
 import org.apache.pekko.http.javadsl.server.PathMatchers;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -73,7 +73,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.rejectEmptyRespons
 
 // #rejectEmptyResponse-example
 
-public class MiscDirectivesExamplesTest extends JUnitRouteTest {
+public class MiscDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testWithSizeLimit() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/ParameterDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/ParameterDirectivesExamplesTest.java
index 69042e6ea..b3d33fa6c 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/ParameterDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/ParameterDirectivesExamplesTest.java
@@ -16,9 +16,9 @@ package docs.http.javadsl.server.directives;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map.Entry;
 import java.util.function.Function;
@@ -66,7 +66,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.parameterList;
 
 // #parameterSeq
 
-public class ParameterDirectivesExamplesTest extends JUnitRouteTest {
+public class ParameterDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testParameter() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/PathDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/PathDirectivesExamplesTest.java
index 87d6f25cb..2964cb33c 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/PathDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/PathDirectivesExamplesTest.java
@@ -17,12 +17,12 @@ import java.util.Arrays;
 import java.util.regex.Pattern;
 
 import org.apache.pekko.http.javadsl.server.PathMatchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 // #path-matcher
 import org.apache.pekko.http.javadsl.server.PathMatcher1;
 import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
@@ -115,7 +115,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 import static org.apache.pekko.http.javadsl.server.Directives.ignoreTrailingSlash;
 // #ignoreTrailingSlash
 
-public class PathDirectivesExamplesTest extends JUnitRouteTest {
+public class PathDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   // #path-prefix-test, path-suffix, raw-path-prefix, raw-path-prefix-test
   Supplier<RouteAdapter> completeWithUnmatchedPath =
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
index c3d9c5a67..937ef7fd1 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
@@ -22,14 +22,14 @@ import org.apache.pekko.http.javadsl.model.headers.Range;
 import org.apache.pekko.http.javadsl.model.headers.RangeUnits;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
 import org.apache.pekko.stream.Materializer;
 import org.apache.pekko.util.ByteString;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.withRangeSupport;
 
 // #withRangeSupport
 
-public class RangeDirectivesExamplesTest extends JUnitRouteTest {
+public class RangeDirectivesExamplesTest extends JUnitJupiterRouteTest {
   @Override
   public Config additionalConfig() {
     return ConfigFactory.parseString("pekko.http.routing.range-coalescing-threshold=2");
@@ -62,7 +62,7 @@ public class RangeDirectivesExamplesTest extends JUnitRouteTest {
         org.apache.pekko.http.javadsl.model.ContentRange.create(0, 2, 8);
     final org.apache.pekko.http.javadsl.model.ContentRange bytes678Range =
         org.apache.pekko.http.javadsl.model.ContentRange.create(6, 7, 8);
-    final Materializer materializer = systemResource().materializer();
+    final Materializer materializer = materializer();
 
     testRoute(route)
         .run(
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
index 43b794318..3bbb9a075 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
@@ -19,8 +19,8 @@ import org.apache.pekko.http.javadsl.model.headers.HttpOrigin;
 import org.apache.pekko.http.javadsl.model.headers.Origin;
 import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
@@ -57,7 +57,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.respondWithDefault
 import static org.apache.pekko.http.javadsl.server.Directives.respondWithHeader;
 
 // #respondWithDefaultHeaders
-public class RespondWithDirectivesExamplesTest extends JUnitRouteTest {
+public class RespondWithDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testMultipleHeaders() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
index 47d3ffeb3..250756be4 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
@@ -20,8 +20,8 @@ import org.apache.pekko.http.javadsl.server.Rejections;
 import org.apache.pekko.http.javadsl.server.RequestContext;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.server.RouteResult;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.concurrent.CompletionStage;
@@ -53,7 +53,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 // #failWith
 
-public class RouteDirectivesExamplesTest extends JUnitRouteTest {
+public class RouteDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testShowRedirectOnCompleteWithTerms() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/SchemeDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/SchemeDirectivesExamplesTest.java
index de6c04cbd..892eea9f8 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/SchemeDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/SchemeDirectivesExamplesTest.java
@@ -13,12 +13,12 @@
 
 package docs.http.javadsl.server.directives;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.model.headers.Location;
 
 // #extractScheme
@@ -34,7 +34,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.scheme;
 
 // #scheme
 
-public class SchemeDirectivesExamplesTest extends JUnitRouteTest {
+public class SchemeDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testScheme() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java
index ecaae0ef9..ed1479f7b 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java
@@ -17,9 +17,9 @@ import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.model.headers.BasicHttpCredentials;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.japi.JavaPartialFunction;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import scala.PartialFunction;
 import scala.util.Either;
 import scala.util.Left;
@@ -96,7 +96,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.extractCredentials
 
 // #extractCredentials
 
-public class SecurityDirectivesExamplesTest extends JUnitRouteTest {
+public class SecurityDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testAuthenticateBasic() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
index 5bc11e43c..c1d39dedd 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
@@ -25,9 +25,9 @@ import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.testkit.TestKit;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 import java.util.Optional;
@@ -84,7 +84,7 @@ public class TimeoutDirectivesExamplesTest extends AllDirectives {
   }
   // #testSetup
 
-  @After
+  @AfterEach
   public void shutDown() {
     TestKit.shutdownActorSystem(
         system, scala.concurrent.duration.Duration.create(1, TimeUnit.SECONDS), false);
@@ -161,7 +161,7 @@ public class TimeoutDirectivesExamplesTest extends AllDirectives {
   }
 
   // make it compile only to avoid flaking in slow builds
-  @Ignore("Compile only test")
+  @Disabled("Compile only test")
   @Test
   public void testRequestTimeoutCustomResponseCanBeAddedSeparately() throws Exception {
     // #withRequestTimeoutResponse
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
index b5620c4bf..20f89604e 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
@@ -22,14 +22,14 @@ import org.apache.pekko.http.javadsl.model.ws.BinaryMessage;
 import org.apache.pekko.http.javadsl.model.ws.Message;
 import org.apache.pekko.http.javadsl.model.ws.TextMessage;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.WSProbe;
 import org.apache.pekko.stream.OverflowStrategy;
 import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -50,7 +50,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.extractOfferedWsPr
 import static org.apache.pekko.http.javadsl.server.Directives.handleWebSocketMessagesForOptionalProtocol;
 
 // #extractOfferedWsProtocols
-public class WebSocketDirectivesExamplesTest extends JUnitRouteTest {
+public class WebSocketDirectivesExamplesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testHandleWebSocketMessages() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/PlayRoutesComparisonTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/PlayRoutesComparisonTest.java
index 25da5c5e0..c0efea4de 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/PlayRoutesComparisonTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/PlayRoutesComparisonTest.java
@@ -17,9 +17,9 @@ import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.AllDirectives;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Optional;
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
 import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class PlayRoutesComparisonTest extends JUnitRouteTest {
+public class PlayRoutesComparisonTest extends JUnitJupiterRouteTest {
 
   static class Clients {
     static String list() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitFragmentTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitFragmentTest.java
index 92203c0bc..0b577414f 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitFragmentTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitFragmentTest.java
@@ -18,11 +18,11 @@ import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.AllDirectives;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class TestKitFragmentTest extends JUnitRouteTest {
+public class TestKitFragmentTest extends JUnitJupiterRouteTest {
   class FragmentTester extends AllDirectives {
     public Route createRoute(Route fragment) {
       return pathPrefix("test", () -> fragment);
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitWithActorTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitWithActorTest.java
index d7dd793e7..e63461a45 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitWithActorTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitWithActorTest.java
@@ -18,13 +18,13 @@ import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.javadsl.Adapter;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class TestKitWithActorTest extends JUnitRouteTest {
+public class TestKitWithActorTest extends JUnitJupiterRouteTest {
 
   @Test
   public void returnPongForGetPing() {
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/TestkitExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/TestkitExampleTest.java
index a528f3efe..c7f06fbf5 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/TestkitExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/TestkitExampleTest.java
@@ -16,11 +16,11 @@ package docs.http.javadsl.server.testkit;
 // #simple-app-testing
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class TestkitExampleTest extends JUnitRouteTest {
+public class TestkitExampleTest extends JUnitJupiterRouteTest {
   TestRoute appRoute = testRoute(new MyAppService().createRoute());
 
   @Test
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/WithTimeoutTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/WithTimeoutTest.java
index 2e1d508ce..83214b620 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/WithTimeoutTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/WithTimeoutTest.java
@@ -13,13 +13,13 @@
 
 package docs.http.javadsl.server.testkit;
 
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
-import org.junit.Test;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
+import org.junit.jupiter.api.Test;
 import scala.concurrent.duration.FiniteDuration;
 
 import java.util.concurrent.TimeUnit;
 
-public class WithTimeoutTest extends JUnitRouteTest {
+public class WithTimeoutTest extends JUnitJupiterRouteTest {
   // #timeout-setting
   @Override
   public FiniteDuration awaitDuration() {
diff --git a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/EntityDiscardingTest.java b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/EntityDiscardingTest.java
index 59ced0e92..3380ebbda 100644
--- a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/EntityDiscardingTest.java
+++ b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/EntityDiscardingTest.java
@@ -21,17 +21,16 @@ import org.apache.pekko.stream.SystemMaterializer;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
 import scala.util.Try;
 
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class EntityDiscardingTest extends JUnitSuite {
+public class EntityDiscardingTest {
 
   private ActorSystem sys = ActorSystem.create("test");
   private Iterable<ByteString> testData =
diff --git a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/HttpMessageTest.java b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/HttpMessageTest.java
index 56df3a7e8..6aac0b121 100644
--- a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/HttpMessageTest.java
+++ b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/HttpMessageTest.java
@@ -15,16 +15,15 @@ package org.apache.pekko.http.javadsl.model;
 
 import org.apache.pekko.http.scaladsl.model.AttributeKey$;
 import org.apache.pekko.stream.scaladsl.TLSPlacebo;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
-public class HttpMessageTest extends JUnitSuite {
+public class HttpMessageTest {
   @Test
   public void testRetrieveAttributeByKey() {
     AttributeKey<String> oneStringKey = AttributeKey.create("one", String.class);
diff --git a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java
index 71785b047..ce30e1979 100644
--- a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java
+++ b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java
@@ -15,13 +15,13 @@ package org.apache.pekko.http.javadsl.model;
 
 import org.apache.pekko.http.scaladsl.model.IllegalUriException;
 import org.apache.pekko.japi.Pair;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class UriTest extends JUnitSuite {
+public class UriTest {
 
   @Test
   public void testValidUrlExamples() {
@@ -83,79 +83,106 @@ public class UriTest extends JUnitSuite {
   }
 
   // #illegal-scheme
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testIllegalScheme() {
-    Uri.create("foö:/a");
-    // IllegalUriException(
-    //  "Illegal URI reference: Invalid input 'ö', expected scheme-char, 'EOI', '#', ':', '?',
-    // slashSegments or pchar (line 1, column 3)",
-    //  "http://user:ö@host\n" +
-    //  "            ^"
-    // )
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          Uri.create("foö:/a");
+          // IllegalUriException(
+          //  "Illegal URI reference: Invalid input 'ö', expected scheme-char, 'EOI', '#', ':', '?',
+          // slashSegments or pchar (line 1, column 3)",
+          //  "http://user:ö@host\n" +
+          //  "            ^"
+          // )
+        });
   }
   // #illegal-scheme
 
   // #illegal-userinfo
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testIllegalUserInfo() {
-    Uri.create("http://user:ö@host");
-    // IllegalUriException(
-    //  "Illegal URI reference: Invalid input 'ö', expected userinfo-char, pct-encoded, '@' or port
-    // (line 1, column 13)",
-    //  "http://use%2G@host\n" +
-    //  "            ^"
-    // )
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          Uri.create("http://user:ö@host");
+          // IllegalUriException(
+          //  "Illegal URI reference: Invalid input 'ö', expected userinfo-char, pct-encoded, '@' or
+          // port
+          // (line 1, column 13)",
+          //  "http://use%2G@host\n" +
+          //  "            ^"
+          // )
+        });
   }
   // #illegal-userinfo
 
   // #illegal-percent-encoding
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testIllegalPercentEncoding() {
-    Uri.create("http://use%2G@host");
-    // IllegalUriException(
-    //  "Illegal URI reference: Invalid input 'G', expected HEXDIG (line 1, column 13)",
-    //  "http://www.example.com/name with spaces/\n" +
-    //  "                           ^"
-    // )
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          Uri.create("http://use%2G@host");
+          // IllegalUriException(
+          //  "Illegal URI reference: Invalid input 'G', expected HEXDIG (line 1, column 13)",
+          //  "http://www.example.com/name with spaces/\n" +
+          //  "                           ^"
+          // )
+        });
   }
   // #illegal-percent-encoding
 
   // #illegal-path
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testIllegalPath() {
-    Uri.create("http://www.example.com/name with spaces/");
-    // IllegalUriException(
-    //  "Illegal URI reference: Invalid input ' ', expected '/', 'EOI', '#', '?' or pchar (line 1,
-    // column 28)",
-    //  "http://www.example.com/name with spaces/\n" +
-    //  "                           ^"
-    // )
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          Uri.create("http://www.example.com/name with spaces/");
+          // IllegalUriException(
+          //  "Illegal URI reference: Invalid input ' ', expected '/', 'EOI', '#', '?' or pchar
+          // (line 1,
+          // column 28)",
+          //  "http://www.example.com/name with spaces/\n" +
+          //  "                           ^"
+          // )
+        });
   }
   // #illegal-path
 
   // #illegal-path-with-control-char
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testIllegalPathWithControlCharacter() {
-    Uri.create("http:///with\newline");
-    // IllegalUriException(
-    //  "Illegal URI reference: Invalid input '\\n', expected '/', 'EOI', '#', '?' or pchar (line 1,
-    // column 13)",
-    //  "http:///with\n" +
-    //  "            ^"
-    // )
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          Uri.create("http:///with\newline");
+          // IllegalUriException(
+          //  "Illegal URI reference: Invalid input '\\n', expected '/', 'EOI', '#', '?' or pchar
+          // (line 1,
+          // column 13)",
+          //  "http:///with\n" +
+          //  "            ^"
+          // )
+        });
   }
   // #illegal-path-with-control-char
 
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testIllegalQuery() {
-    // #illegal-query
-    Uri.create("?a%b=c").query();
-    // IllegalUriException(
-    //  " Illegal query: Invalid input '=', expected HEXDIG (line 1, column 4): a%b=c",
-    //  "a%b=c\n" +
-    //  " ^"
-    // )
-    // #illegal-query
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          // #illegal-query
+          Uri.create("?a%b=c").query();
+          // IllegalUriException(
+          //  " Illegal query: Invalid input '=', expected HEXDIG (line 1, column 4): a%b=c",
+          //  "a%b=c\n" +
+          //  " ^"
+          // )
+          // #illegal-query
+        });
   }
 
   // #query-strict-definition
@@ -203,52 +230,71 @@ public class UriTest extends JUnitSuite {
   }
 
   // #query-strict-mode-exception-1
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testStrictModeException1() {
-    strict("a^=b");
-    // IllegalUriException(
-    //  "Illegal query: Invalid input '^', expected '+', '=', query-char, 'EOI', '&' or pct-encoded
-    // (line 1, column 2)",
-    //  "a^=b\n" +
-    //  " ^")
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          strict("a^=b");
+          // IllegalUriException(
+          //  "Illegal query: Invalid input '^', expected '+', '=', query-char, 'EOI', '&' or
+          // pct-encoded
+          // (line 1, column 2)",
+          //  "a^=b\n" +
+          //  " ^")
+        });
   }
   // #query-strict-mode-exception-1
 
   // #query-strict-mode-exception-2
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testStrictModeException2() {
-    strict("a;=b");
-    // IllegalUriException(
-    //  "Illegal query: Invalid input ';', expected '+', '=', query-char, 'EOI', '&' or pct-encoded
-    // (line 1, column 2)",
-    //  "a;=b\n" +
-    //  " ^")
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          strict("a;=b");
+          // IllegalUriException(
+          //  "Illegal query: Invalid input ';', expected '+', '=', query-char, 'EOI', '&' or
+          // pct-encoded
+          // (line 1, column 2)",
+          //  "a;=b\n" +
+          //  " ^")
+        });
   }
   // #query-strict-mode-exception-2
 
   // #query-strict-mode-exception-3
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testStrictModeException3() {
-    // double '=' in query string is invalid
-    strict("a=b=c");
-    // IllegalUriException(
-    //  "Illegal query: Invalid input '=', expected '+', query-char, 'EOI', '&' or pct-encoded (line
-    // 1, column 4)",
-    //  "a=b=c\n"  +
-    //  " ^")
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          // double '=' in query string is invalid
+          strict("a=b=c");
+          // IllegalUriException(
+          //  "Illegal query: Invalid input '=', expected '+', query-char, 'EOI', '&' or pct-encoded
+          // (line
+          // 1, column 4)",
+          //  "a=b=c\n"  +
+          //  " ^")
+        });
   }
   // #query-strict-mode-exception-3
 
   // #query-strict-mode-exception-4
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testStrictModeException4() {
-    // following '%', it should be percent encoding (HEXDIG), but "%b=" is not a valid percent
-    // encoding
-    strict("a%b=c");
-    // IllegalUriException(
-    //  "Illegal query: Invalid input '=', expected HEXDIG (line 1, column 4)",
-    //  "a%b=c\n" +
-    //  "   ^")
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          // following '%', it should be percent encoding (HEXDIG), but "%b=" is not a valid percent
+          // encoding
+          strict("a%b=c");
+          // IllegalUriException(
+          //  "Illegal query: Invalid input '=', expected HEXDIG (line 1, column 4)",
+          //  "a%b=c\n" +
+          //  "   ^")
+        });
   }
   // #query-strict-mode-exception-4
 
@@ -300,17 +346,22 @@ public class UriTest extends JUnitSuite {
   }
 
   // #query-relaxed-mode-exception-1
-  @Test(expected = IllegalUriException.class)
+  @Test
   public void testRelaxedModeException1() {
-    // following '%', it should be percent encoding (HEXDIG), but "%b=" is not a valid percent
-    // encoding
-    // still invalid even in relaxed mode
-    relaxed("a%b=c");
-    // IllegalUriException(
-    //  "Illegal query: Invalid input '=', expected '+', query-char, 'EOI', '&' or pct-encoded (line
-    // 1, column 4)",
-    //  "a%b=c\n" +
-    //  "   ^")
+    assertThrows(
+        IllegalUriException.class,
+        () -> {
+          // following '%', it should be percent encoding (HEXDIG), but "%b=" is not a valid percent
+          // encoding
+          // still invalid even in relaxed mode
+          relaxed("a%b=c");
+          // IllegalUriException(
+          //  "Illegal query: Invalid input '=', expected '+', query-char, 'EOI', '&' or pct-encoded
+          // (line
+          // 1, column 4)",
+          //  "a%b=c\n" +
+          //  "   ^")
+        });
   }
   // #query-relaxed-mode-exception-1
 
diff --git a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEventTest.java b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEventTest.java
index 0a713b19e..7fcb857da 100644
--- a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEventTest.java
+++ b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEventTest.java
@@ -19,56 +19,55 @@ package org.apache.pekko.http.javadsl.model.sse;
 import java.util.Optional;
 import java.util.OptionalInt;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-public class ServerSentEventTest extends JUnitSuite {
+public class ServerSentEventTest {
 
   @Test
   public void create() {
     final ServerSentEvent event =
         ServerSentEvent.create(
             "data", Optional.of("type"), Optional.of("id"), OptionalInt.of(1000));
-    Assert.assertEquals("data", event.getData());
-    Assert.assertEquals(Optional.of("type"), event.getEventType());
-    Assert.assertEquals(Optional.of("id"), event.getId());
-    Assert.assertEquals(OptionalInt.of(1000), event.getRetry());
+    Assertions.assertEquals("data", event.getData());
+    Assertions.assertEquals(Optional.of("type"), event.getEventType());
+    Assertions.assertEquals(Optional.of("id"), event.getId());
+    Assertions.assertEquals(OptionalInt.of(1000), event.getRetry());
   }
 
   @Test
   public void createData() {
     final ServerSentEvent event = ServerSentEvent.create("data");
-    Assert.assertEquals("data", event.getData());
+    Assertions.assertEquals("data", event.getData());
   }
 
   @Test
   public void createDataEvent() {
     final ServerSentEvent event = ServerSentEvent.create("data", "type");
-    Assert.assertEquals("data", event.getData());
-    Assert.assertEquals(Optional.of("type"), event.getEventType());
+    Assertions.assertEquals("data", event.getData());
+    Assertions.assertEquals(Optional.of("type"), event.getEventType());
   }
 
   @Test
   public void createDataEventId() {
     final ServerSentEvent event = ServerSentEvent.create("data", "type", "id");
-    Assert.assertEquals("data", event.getData());
-    Assert.assertEquals(Optional.of("type"), event.getEventType());
-    Assert.assertEquals(Optional.of("id"), event.getId());
+    Assertions.assertEquals("data", event.getData());
+    Assertions.assertEquals(Optional.of("type"), event.getEventType());
+    Assertions.assertEquals(Optional.of("id"), event.getId());
   }
 
   @Test
   public void createRetry() {
     final ServerSentEvent event = ServerSentEvent.create("data", 1000);
-    Assert.assertEquals(OptionalInt.of(1000), event.getRetry());
+    Assertions.assertEquals(OptionalInt.of(1000), event.getRetry());
   }
 
   @Test
   public void heartbeat() {
     final ServerSentEvent event = ServerSentEvent.heartbeat();
-    Assert.assertEquals("", event.getData());
-    Assert.assertEquals(Optional.empty(), event.getEventType());
-    Assert.assertEquals(Optional.empty(), event.getId());
-    Assert.assertEquals(OptionalInt.empty(), event.getRetry());
+    Assertions.assertEquals("", event.getData());
+    Assertions.assertEquals(Optional.empty(), event.getEventType());
+    Assertions.assertEquals(Optional.empty(), event.getId());
+    Assertions.assertEquals(OptionalInt.empty(), event.getRetry());
   }
 }
diff --git a/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ClientConnectionSettingsTest.java b/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ClientConnectionSettingsTest.java
index f68df0298..631bf1652 100644
--- a/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ClientConnectionSettingsTest.java
+++ b/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ClientConnectionSettingsTest.java
@@ -14,10 +14,9 @@
 package org.apache.pekko.http.javadsl.settings;
 
 import org.apache.pekko.actor.ActorSystem;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
-public class ClientConnectionSettingsTest extends JUnitSuite {
+public class ClientConnectionSettingsTest {
 
   @Test
   public void testCreateWithActorSystem() {
diff --git a/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ConnectionPoolSettingsTest.java b/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ConnectionPoolSettingsTest.java
index 8dc9d6645..d48bd76de 100644
--- a/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ConnectionPoolSettingsTest.java
+++ b/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ConnectionPoolSettingsTest.java
@@ -14,10 +14,9 @@
 package org.apache.pekko.http.javadsl.settings;
 
 import org.apache.pekko.actor.ActorSystem;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
-public class ConnectionPoolSettingsTest extends JUnitSuite {
+public class ConnectionPoolSettingsTest {
 
   @Test
   public void testCreateWithActorSystem() {
diff --git a/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ParserSettingsTest.java b/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ParserSettingsTest.java
index add388ccc..968b07c28 100644
--- a/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ParserSettingsTest.java
+++ b/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ParserSettingsTest.java
@@ -14,10 +14,9 @@
 package org.apache.pekko.http.javadsl.settings;
 
 import org.apache.pekko.actor.ActorSystem;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
-public class ParserSettingsTest extends JUnitSuite {
+public class ParserSettingsTest {
 
   @Test
   public void testCreateWithActorSystem() {
diff --git a/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ServerSettingsTest.java b/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ServerSettingsTest.java
index 11a8e680a..4c0cc8796 100644
--- a/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ServerSettingsTest.java
+++ b/http-core/src/test/java/org/apache/pekko/http/javadsl/settings/ServerSettingsTest.java
@@ -14,10 +14,9 @@
 package org.apache.pekko.http.javadsl.settings;
 
 import org.apache.pekko.actor.ActorSystem;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
-public class ServerSettingsTest extends JUnitSuite {
+public class ServerSettingsTest {
 
   @Test
   public void testCreateWithActorSystem() {
diff --git a/http-marshallers-java/http-jackson/src/test/java/org/apache/pekko/http/javadsl/marshallers/jackson/JacksonTest.java b/http-marshallers-java/http-jackson/src/test/java/org/apache/pekko/http/javadsl/marshallers/jackson/JacksonTest.java
index ac7cad591..d5776a034 100644
--- a/http-marshallers-java/http-jackson/src/test/java/org/apache/pekko/http/javadsl/marshallers/jackson/JacksonTest.java
+++ b/http-marshallers-java/http-jackson/src/test/java/org/apache/pekko/http/javadsl/marshallers/jackson/JacksonTest.java
@@ -30,17 +30,17 @@ import org.apache.pekko.http.javadsl.model.HttpEntities;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.RequestEntity;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class JacksonTest extends JUnitRouteTest {
+public class JacksonTest extends JUnitJupiterRouteTest {
 
   public static class SomeData {
     public final String field;
diff --git a/http-marshallers-java/http-jackson3/src/test/java/org/apache/pekko/http/javadsl/marshallers/jackson3/JacksonTest.java b/http-marshallers-java/http-jackson3/src/test/java/org/apache/pekko/http/javadsl/marshallers/jackson3/JacksonTest.java
index ae185a87e..ba9e468dc 100644
--- a/http-marshallers-java/http-jackson3/src/test/java/org/apache/pekko/http/javadsl/marshallers/jackson3/JacksonTest.java
+++ b/http-marshallers-java/http-jackson3/src/test/java/org/apache/pekko/http/javadsl/marshallers/jackson3/JacksonTest.java
@@ -32,17 +32,17 @@ import org.apache.pekko.http.javadsl.model.HttpEntities;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.RequestEntity;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class JacksonTest extends JUnitRouteTest {
+public class JacksonTest extends JUnitJupiterRouteTest {
 
   public static class SomeData {
     public final String field;
@@ -75,9 +75,8 @@ public class JacksonTest extends JUnitRouteTest {
       // CompletableFuture.get wraps in one layer of ExecutionException
       String message = ex.getCause().getMessage();
       assertTrue(
-          "Unexpected exception message: " + message,
-          message.startsWith(
-              "Cannot unmarshal JSON as SomeData: Unrecognized property \"droids\""));
+          message.startsWith("Cannot unmarshal JSON as SomeData: Unrecognized property \"droids\""),
+          "Unexpected exception message: " + message);
     } finally {
       sys.terminate();
     }
diff --git a/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/ActorSystemExtension.scala b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/ActorSystemExtension.scala
new file mode 100644
index 000000000..19a20e069
--- /dev/null
+++ b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/ActorSystemExtension.scala
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, which was derived from Akka.
+ */
+
+package org.apache.pekko.http.javadsl.testkit
+
+import scala.concurrent.Await
+import scala.concurrent.duration._
+
+import org.junit.jupiter.api.extension.{ AfterEachCallback, BeforeEachCallback, ExtensionContext }
+
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.stream.Materializer
+import pekko.stream.SystemMaterializer
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
+/**
+ * A JUnit 5 (Jupiter) Extension that manages the lifecycle of an [[ActorSystem]].
+ *
+ * This is the JUnit 5 counterpart of [[ActorSystemResource]] which uses JUnit 4's
+ * [[org.junit.rules.ExternalResource]]. It implements [[BeforeEachCallback]] and
+ * [[AfterEachCallback]] to create and terminate the ActorSystem around each test method.
+ *
+ * Usage with `@RegisterExtension`:
+ * {{{
+ * @RegisterExtension
+ * ActorSystemExtension systemExtension = new ActorSystemExtension("MyTest", ConfigFactory.empty());
+ * }}}
+ *
+ * Or use it indirectly through [[JUnitJupiterRouteTest]].
+ */
+class ActorSystemExtension(name: String, additionalConfig: Config)
+    extends BeforeEachCallback with AfterEachCallback {
+
+  protected def config: Config = additionalConfig.withFallback(ConfigFactory.load())
+  protected def createSystem(): ActorSystem = ActorSystem(name, config)
+
+  implicit def system: ActorSystem = _system
+  implicit def materializer: Materializer = SystemMaterializer.get(system).materializer
+
+  private[this] var _system: ActorSystem = null
+
+  override def beforeEach(context: ExtensionContext): Unit = {
+    require(_system eq null, "ActorSystem already created; nested test execution is not supported")
+    _system = createSystem()
+  }
+
+  override def afterEach(context: ExtensionContext): Unit = {
+    if (_system ne null) {
+      Await.result(_system.terminate(), 5.seconds)
+      _system = null
+    }
+  }
+}
diff --git a/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/JUnitJupiterRouteTest.scala b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/JUnitJupiterRouteTest.scala
new file mode 100644
index 000000000..f052da1fe
--- /dev/null
+++ b/http-testkit/src/main/scala/org/apache/pekko/http/javadsl/testkit/JUnitJupiterRouteTest.scala
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, which was derived from Akka.
+ */
+
+package org.apache.pekko.http.javadsl.testkit
+
+import scala.concurrent.Future
+
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.extension.RegisterExtension
+
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.event.Logging
+import pekko.http.javadsl.model.HttpRequest
+import pekko.http.javadsl.server._
+import pekko.stream.Materializer
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
+/**
+ * A RouteTest that uses JUnit Jupiter assertions. ActorSystem and Materializer lifecycle
+ * is managed via [[ActorSystemExtension]], the JUnit Jupiter equivalent of
+ * [[org.junit.rules.ExternalResource]].
+ *
+ * This is the JUnit Jupiter counterpart of [[JUnitRouteTest]]. Migrate your tests from
+ * `extends JUnitRouteTest` to `extends JUnitJupiterRouteTest` to use JUnit Jupiter annotations
+ * and assertions.
+ */
+abstract class JUnitJupiterRouteTestBase extends RouteTest {
+  protected def systemExtension: ActorSystemExtension
+  implicit def system: ActorSystem = systemExtension.system
+  implicit def materializer: Materializer = systemExtension.materializer
+
+  protected def createTestRouteResultAsync(request: HttpRequest, result: Future[RouteResult]): TestRouteResult =
+    new TestRouteResult(result, awaitDuration)(system.dispatcher, materializer) {
+      protected def assertEquals(expected: AnyRef, actual: AnyRef, message: String): Unit =
+        reportDetails { Assertions.assertEquals(expected, actual, message) }
+
+      protected def assertEquals(expected: Int, actual: Int, message: String): Unit =
+        Assertions.assertEquals(expected, actual, message)
+
+      protected def assertTrue(predicate: Boolean, message: String): Unit =
+        Assertions.assertTrue(predicate, message)
+
+      protected def fail(message: String): Unit = {
+        Assertions.fail[Unit](message)
+        throw new IllegalStateException("Assertion should have failed")
+      }
+
+      def reportDetails[T](block: => T): T = {
+        try block
+        catch {
+          case t: Throwable => throw new AssertionError(t.getMessage + "\n" +
+              "  Request was:      " + request + "\n" +
+              "  Route result was: " + result + "\n", t)
+        }
+      }
+    }
+}
+
+/**
+ * JUnit Jupiter route test base class. Extend this class to write HTTP route tests
+ * using JUnit Jupiter annotations (`@Test`, `@BeforeEach`, `@AfterEach`, etc.).
+ *
+ * The ActorSystem is managed automatically via [[ActorSystemExtension]]. Override
+ * `additionalConfig` to provide custom configuration.
+ *
+ * Example usage:
+ * {{{
+ * import org.junit.jupiter.api.Test;
+ * import static org.junit.jupiter.api.Assertions.*;
+ *
+ * public class MyRouteTest extends JUnitJupiterRouteTest {
+ *     @Test
+ *     public void testHello() {
+ *         testRoute(get(() -> complete("hello")))
+ *             .run(HttpRequest.GET("/"))
+ *             .assertStatusCode(StatusCodes.OK);
+ *     }
+ * }
+ * }}}
+ */
+abstract class JUnitJupiterRouteTest extends JUnitJupiterRouteTestBase {
+  protected def additionalConfig: Config = ConfigFactory.empty()
+
+  @RegisterExtension
+  protected val systemExtension: ActorSystemExtension =
+    new ActorSystemExtension(Logging.simpleName(getClass), additionalConfig)
+}
diff --git a/http-testkit/src/test/java/org/apache/pekko/http/javadsl/testkit/JUnitRouteTestTest.java b/http-testkit/src/test/java/org/apache/pekko/http/javadsl/testkit/JUnitRouteTestTest.java
index ce45d51fb..df122a72a 100644
--- a/http-testkit/src/test/java/org/apache/pekko/http/javadsl/testkit/JUnitRouteTestTest.java
+++ b/http-testkit/src/test/java/org/apache/pekko/http/javadsl/testkit/JUnitRouteTestTest.java
@@ -16,14 +16,14 @@ package org.apache.pekko.http.javadsl.testkit;
 import java.util.function.Function;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.apache.pekko.http.javadsl.testkit.*;
 
 import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.model.headers.*;
 import org.apache.pekko.http.javadsl.server.Rejections;
 
-public class JUnitRouteTestTest extends JUnitRouteTest {
+public class JUnitRouteTestTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testTheMostSimpleAndDirectRouteTest() {
diff --git a/http-tests/src/test/java/AllJavaTests.java b/http-tests/src/test/java/AllJavaTests.java
deleted file mode 100644
index e0ee02168..000000000
--- a/http-tests/src/test/java/AllJavaTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * This file is part of the Apache Pekko project, which was derived from Akka.
- */
-
-/*
- * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
- */
-
-import org.apache.pekko.http.javadsl.server.HandlerBindingTest;
-import docs.http.javadsl.server.HandlerExampleDocTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({HandlerBindingTest.class, HandlerExampleDocTest.class})
-public class AllJavaTests {}
diff --git a/http-tests/src/test/java/docs/http/javadsl/server/HandlerExampleDocTest.java b/http-tests/src/test/java/docs/http/javadsl/server/HandlerExampleDocTest.java
index 666840720..fa7695517 100644
--- a/http-tests/src/test/java/docs/http/javadsl/server/HandlerExampleDocTest.java
+++ b/http-tests/src/test/java/docs/http/javadsl/server/HandlerExampleDocTest.java
@@ -21,14 +21,14 @@ import java.util.concurrent.Executor;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.HttpResponse;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 
 // #simple-handler-example-full
@@ -58,7 +58,7 @@ import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 // #async-handler-1
 
-public class HandlerExampleDocTest extends JUnitRouteTest {
+public class HandlerExampleDocTest extends JUnitJupiterRouteTest {
   @Test
   public void testSimpleHandler() {
     // #simple-handler-example-full
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
index 22a44473f..39ec51658 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
@@ -17,12 +17,12 @@ import org.apache.pekko.event.LoggingAdapter;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.HttpResponse;
 import org.apache.pekko.http.javadsl.settings.ClientConnectionSettings;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings;
 import org.apache.pekko.japi.function.Function;
 import org.apache.pekko.stream.javadsl.Flow;
 import com.typesafe.config.ConfigFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import javax.net.ssl.SSLContext;
 import java.util.concurrent.CompletionStage;
@@ -31,7 +31,7 @@ import static org.apache.pekko.http.javadsl.ConnectHttp.toHost;
 import static org.apache.pekko.http.javadsl.ConnectHttp.toHostHttps;
 
 @SuppressWarnings("ConstantConditions")
-public class HttpAPIsTest extends JUnitRouteTest {
+public class HttpAPIsTest extends JUnitJupiterRouteTest {
 
   @Test
   public void placeholderCompileTimeOnlyTest() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/marshalling/sse/EventStreamMarshallingTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/marshalling/sse/EventStreamMarshallingTest.java
index 264c2ac75..ccec2b6a2 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/marshalling/sse/EventStreamMarshallingTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/marshalling/sse/EventStreamMarshallingTest.java
@@ -18,20 +18,20 @@ package org.apache.pekko.http.javadsl.marshalling.sse;
 
 import org.apache.pekko.http.javadsl.model.sse.ServerSentEvent;
 import org.apache.pekko.http.javadsl.server.Route;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.pekko.http.javadsl.model.HttpRequest.GET;
 import static org.apache.pekko.http.javadsl.model.MediaTypes.TEXT_EVENT_STREAM;
 import static org.apache.pekko.http.javadsl.server.Directives.completeOK;
 import static org.apache.pekko.util.ByteString.emptyByteString;
 
-public class EventStreamMarshallingTest extends JUnitRouteTest {
+public class EventStreamMarshallingTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testToEventStream() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/CompleteTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/CompleteTest.java
index 94ed7ab21..912e24ff6 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/CompleteTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/CompleteTest.java
@@ -19,16 +19,16 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
 import org.apache.pekko.http.javadsl.model.StatusCodes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.MediaTypes;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class CompleteTest extends JUnitRouteTest {
+public class CompleteTest extends JUnitJupiterRouteTest {
   @Test
   public void completeWithString() {
     Route route = complete("Everything OK!");
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/HandlerBindingTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/HandlerBindingTest.java
index bc3e54ca7..9d7264bbf 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/HandlerBindingTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/HandlerBindingTest.java
@@ -15,15 +15,15 @@ package org.apache.pekko.http.javadsl.server;
 
 import static org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers.INTEGER;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
 import org.apache.pekko.http.scaladsl.model.HttpRequest;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class HandlerBindingTest extends JUnitRouteTest {
+public class HandlerBindingTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testHandlerWithoutExtractions() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/JavaRouteTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/JavaRouteTest.java
index e99c7e12f..407171359 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/JavaRouteTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/JavaRouteTest.java
@@ -30,9 +30,9 @@ import org.apache.pekko.http.javadsl.model.headers.Accept;
 import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 // FIXME discuss how to provide a javadsl.CustomHeader where render() is either pre-implemented or
 // trivial to write in Java
 import org.apache.pekko.http.scaladsl.model.headers.CustomHeader;
@@ -41,7 +41,7 @@ import org.apache.pekko.util.ByteString;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class JavaRouteTest extends JUnitRouteTest {
+public class JavaRouteTest extends JUnitJupiterRouteTest {
   private final Route route = getRoute();
   private static final Unmarshaller<String, BigDecimal> BIG_DECIMAL_PARAM =
       Unmarshaller.sync(BigDecimal::new);
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/MarshallerTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/MarshallerTest.java
index 0787f8ed2..f3904b956 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/MarshallerTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/MarshallerTest.java
@@ -21,15 +21,15 @@ import org.apache.pekko.http.javadsl.marshalling.Marshaller;
 import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.model.headers.*;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.util.ByteString;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class MarshallerTest extends JUnitRouteTest {
+public class MarshallerTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testCustomToStringMarshaller() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/UnmarshallerTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/UnmarshallerTest.java
index aac163c41..e9e5752f1 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/UnmarshallerTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/UnmarshallerTest.java
@@ -14,18 +14,18 @@
 package org.apache.pekko.http.javadsl.server;
 
 import org.apache.pekko.http.javadsl.model.*;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class UnmarshallerTest extends JUnitRouteTest {
+public class UnmarshallerTest extends JUnitJupiterRouteTest {
 
   @Test
   public void unmarshallerWithoutExecutionContext() throws Exception {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/AttributeDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/AttributeDirectivesTest.java
index c7f8b8d61..863a08fef 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/AttributeDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/AttributeDirectivesTest.java
@@ -16,12 +16,12 @@ package org.apache.pekko.http.javadsl.server.directives;
 import org.apache.pekko.http.javadsl.model.AttributeKey;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class AttributeDirectivesTest extends JUnitRouteTest {
+public class AttributeDirectivesTest extends JUnitJupiterRouteTest {
   AttributeKey<String> key = AttributeKey.create("my-key", String.class);
 
   @Test
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CodingDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CodingDirectivesTest.java
index 6707fcbfd..9989281bf 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CodingDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CodingDirectivesTest.java
@@ -20,7 +20,8 @@ import org.apache.pekko.http.javadsl.model.headers.ContentEncoding;
 import org.apache.pekko.http.javadsl.model.headers.HttpEncodings;
 import org.apache.pekko.util.ByteString;
 
-import org.junit.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.testkit.*;
 
@@ -30,7 +31,7 @@ import java.util.concurrent.TimeUnit;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class CodingDirectivesTest extends JUnitRouteTest {
+public class CodingDirectivesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testAutomaticEncodingWhenNoEncodingRequested() throws Exception {
@@ -39,7 +40,7 @@ public class CodingDirectivesTest extends JUnitRouteTest {
     TestRouteResult response = route.run(HttpRequest.create());
     response.assertStatusCode(200);
 
-    Assert.assertEquals("TestString", response.entityBytes().utf8String());
+    Assertions.assertEquals("TestString", response.entityBytes().utf8String());
   }
 
   @Test
@@ -57,7 +58,7 @@ public class CodingDirectivesTest extends JUnitRouteTest {
         Coder.Deflate.decode(response.entityBytes(), materializer())
             .toCompletableFuture()
             .get(3, TimeUnit.SECONDS);
-    Assert.assertEquals("tester", decompressed.utf8String());
+    Assertions.assertEquals("tester", decompressed.utf8String());
   }
 
   @Test
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ComposingDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ComposingDirectivesTest.java
index 203ed8502..d5a67777e 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ComposingDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ComposingDirectivesTest.java
@@ -16,14 +16,14 @@ package org.apache.pekko.http.javadsl.server.directives;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Directives;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.pekko.http.javadsl.common.PartialApplication.*;
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class ComposingDirectivesTest extends JUnitRouteTest {
+public class ComposingDirectivesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testAnyOf0Arg() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CookieDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CookieDirectivesTest.java
index 25c78116c..88d6df520 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CookieDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CookieDirectivesTest.java
@@ -15,13 +15,13 @@ package org.apache.pekko.http.javadsl.server.directives;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.headers.HttpCookie;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class CookieDirectivesTest extends JUnitRouteTest {
+public class CookieDirectivesTest extends JUnitJupiterRouteTest {
   @Test
   public void testCookieValue() {
     TestRoute route = testRoute(cookie("userId", userId -> complete(userId.value())));
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ExecutionDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ExecutionDirectivesTest.java
index c23c9b02e..dbc42319e 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ExecutionDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ExecutionDirectivesTest.java
@@ -15,7 +15,7 @@ package org.apache.pekko.http.javadsl.server.directives;
 
 import org.apache.pekko.http.javadsl.model.ContentTypes;
 import org.apache.pekko.http.javadsl.model.HttpEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
@@ -23,14 +23,14 @@ import org.apache.pekko.http.javadsl.server.ExceptionHandler;
 import org.apache.pekko.http.javadsl.server.RejectionHandler;
 import org.apache.pekko.http.javadsl.server.Route;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.http.scaladsl.server.MethodRejection;
 import org.apache.pekko.http.scaladsl.server.Rejection;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class ExecutionDirectivesTest extends JUnitRouteTest {
+public class ExecutionDirectivesTest extends JUnitJupiterRouteTest {
   @Test
   public void testCatchExceptionThrownFromHandler() {
     Route divide =
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/HeaderDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/HeaderDirectivesTest.java
index ccf13e730..ecefcf555 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/HeaderDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/HeaderDirectivesTest.java
@@ -18,16 +18,16 @@ import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.model.headers.*;
 import org.apache.pekko.http.javadsl.server.Directives;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.japi.pf.PFBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class HeaderDirectivesTest extends JUnitRouteTest {
+public class HeaderDirectivesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testHeaderValue() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/HostDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/HostDirectivesTest.java
index 10de28abb..33a26195e 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/HostDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/HostDirectivesTest.java
@@ -17,16 +17,16 @@ import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.model.Uri;
 import org.apache.pekko.http.javadsl.server.Directives;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class HostDirectivesTest extends JUnitRouteTest {
+public class HostDirectivesTest extends JUnitJupiterRouteTest {
   @Test
   public void testHostFilterBySingleName() {
     TestRoute route = testRoute(host("example.org", () -> complete("OK!")));
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/MarshallingDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/MarshallingDirectivesTest.java
index 8eb3b01b7..6ea3dc2aa 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/MarshallingDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/MarshallingDirectivesTest.java
@@ -16,15 +16,15 @@ package org.apache.pekko.http.javadsl.server.directives;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.server.Directives;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 
 import static org.apache.pekko.http.javadsl.server.Directives.entity;
 
-public class MarshallingDirectivesTest extends JUnitRouteTest {
+public class MarshallingDirectivesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testEntityAsString() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/MiscDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/MiscDirectivesTest.java
index 32f74cd13..df42d3539 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/MiscDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/MiscDirectivesTest.java
@@ -20,9 +20,9 @@ import org.apache.pekko.http.javadsl.model.Uri;
 import org.apache.pekko.http.javadsl.model.headers.XForwardedFor;
 import org.apache.pekko.http.javadsl.model.headers.XRealIp;
 import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -30,7 +30,7 @@ import java.util.Arrays;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class MiscDirectivesTest extends JUnitRouteTest {
+public class MiscDirectivesTest extends JUnitJupiterRouteTest {
 
   static boolean isShort(String str) {
     return str.length() < 5;
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ParameterDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ParameterDirectivesTest.java
index 7d37e6d19..8624b691b 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ParameterDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/ParameterDirectivesTest.java
@@ -17,14 +17,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 
-public class ParameterDirectivesTest extends JUnitRouteTest {
+public class ParameterDirectivesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testStringParameterExtraction() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/PathDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/PathDirectivesTest.java
index 191d3af5f..07d831a99 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/PathDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/PathDirectivesTest.java
@@ -15,16 +15,16 @@ package org.apache.pekko.http.javadsl.server.directives;
 
 import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.model.headers.Host;
 import org.apache.pekko.http.javadsl.server.PathMatchers;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.http.scaladsl.model.HttpRequest;
 
-public class PathDirectivesTest extends JUnitRouteTest {
+public class PathDirectivesTest extends JUnitJupiterRouteTest {
   @Test
   public void testPathPrefixAndPath() {
     TestRoute route =
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/RouteDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/RouteDirectivesTest.java
index 3df0c503d..f2a28371a 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/RouteDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/RouteDirectivesTest.java
@@ -16,16 +16,17 @@ package org.apache.pekko.http.javadsl.server.directives;
 import org.apache.pekko.http.javadsl.model.*;
 import org.apache.pekko.http.javadsl.model.headers.Location;
 import org.apache.pekko.http.javadsl.server.Directives;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.util.ByteString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-public class RouteDirectivesTest extends JUnitRouteTest {
+public class RouteDirectivesTest extends JUnitJupiterRouteTest {
 
   @Test
   public void testRedirection() {
@@ -105,9 +106,13 @@ public class RouteDirectivesTest extends JUnitRouteTest {
                 + "or a custom limit set with `withSizeLimit`.");
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testEmptyRoutesConcatenation() {
-    route();
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          route();
+        });
   }
 
   @Test
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/SchemeDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/SchemeDirectivesTest.java
index ebd6afa26..89727ecc5 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/SchemeDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/SchemeDirectivesTest.java
@@ -17,13 +17,13 @@ import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.model.Uri;
 import org.apache.pekko.http.javadsl.server.Directives;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class SchemeDirectivesTest extends JUnitRouteTest {
+public class SchemeDirectivesTest extends JUnitJupiterRouteTest {
   @Test
   public void testSchemeFilter() {
     TestRoute route = testRoute(scheme("http", () -> complete("OK!")));
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/SecurityDirectivesTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/SecurityDirectivesTest.java
index 3413746b0..c92d4f343 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/SecurityDirectivesTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/SecurityDirectivesTest.java
@@ -17,7 +17,7 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import scala.util.Left;
 import scala.util.Right;
@@ -33,7 +33,7 @@ import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class SecurityDirectivesTest extends JUnitRouteTest {
+public class SecurityDirectivesTest extends JUnitJupiterRouteTest {
 
   // These authenticators don't have to be async; they're just written that way to test the API.
   private CompletionStage<Optional<String>> authenticateUser(Optional<ProvidedCredentials> creds) {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/examples/petstore/PetStoreAPITest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/examples/petstore/PetStoreAPITest.java
index 54b376263..bac12e5ee 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/examples/petstore/PetStoreAPITest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/examples/petstore/PetStoreAPITest.java
@@ -19,16 +19,16 @@ import org.apache.pekko.http.javadsl.model.MediaTypes;
 import org.apache.pekko.http.javadsl.model.StatusCodes;
 import org.apache.pekko.http.javadsl.testkit.*;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class PetStoreAPITest extends JUnitRouteTest {
+public class PetStoreAPITest extends JUnitJupiterRouteTest {
   @Test
   public void testGetPet() {
     TestRouteResult response = createRoute().run(HttpRequest.GET("/pet/1"));
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/examples/simple/SimpleServerTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/examples/simple/SimpleServerTest.java
index 9c941927c..1d0e4bf61 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/examples/simple/SimpleServerTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/examples/simple/SimpleServerTest.java
@@ -16,9 +16,9 @@ package org.apache.pekko.http.javadsl.server.examples.simple;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.testkit.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class SimpleServerTest extends JUnitRouteTest {
+public class SimpleServerTest extends JUnitJupiterRouteTest {
   TestRoute route = testRoute(new SimpleServerApp().createRoute());
 
   @Test
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/values/FormFieldsTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/values/FormFieldsTest.java
index 0e0610d80..d672b8c7f 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/values/FormFieldsTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/values/FormFieldsTest.java
@@ -14,19 +14,19 @@
 package org.apache.pekko.http.javadsl.server.values;
 
 import org.apache.pekko.http.javadsl.model.ContentTypes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.pekko.http.javadsl.model.HttpCharsets;
 import org.apache.pekko.http.javadsl.model.HttpRequest;
 import org.apache.pekko.http.javadsl.model.MediaTypes;
 import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.apache.pekko.japi.Pair;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class FormFieldsTest extends JUnitRouteTest {
+public class FormFieldsTest extends JUnitJupiterRouteTest {
 
   private Pair<String, String> param(String name, String value) {
     return Pair.create(name, value);
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/values/HeadersTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/values/HeadersTest.java
index 30a827999..534ca9578 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/values/HeadersTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/values/HeadersTest.java
@@ -13,9 +13,9 @@
 
 package org.apache.pekko.http.javadsl.server.values;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
 import org.apache.pekko.http.javadsl.testkit.TestRoute;
 
 import org.apache.pekko.http.javadsl.model.*;
@@ -24,7 +24,7 @@ import org.apache.pekko.http.javadsl.model.headers.RawHeader;
 
 import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-public class HeadersTest extends JUnitRouteTest {
+public class HeadersTest extends JUnitJupiterRouteTest {
   final RawHeader testHeaderInstance = RawHeader.create("X-Test-Header", "abcdef-test");
   final Age ageHeaderInstance = Age.create(1000);
 
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/settings/OversizedSseStrategySimpleTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/settings/OversizedSseStrategySimpleTest.java
index 65e8e928f..3b83832a1 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/settings/OversizedSseStrategySimpleTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/settings/OversizedSseStrategySimpleTest.java
@@ -17,11 +17,10 @@
 
 package org.apache.pekko.http.javadsl.settings;
 
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class OversizedSseStrategySimpleTest extends JUnitSuite {
+public class OversizedSseStrategySimpleTest {
 
   @Test
   public void testEnumValues() {
@@ -31,10 +30,10 @@ public class OversizedSseStrategySimpleTest extends JUnitSuite {
     OversizedSseStrategy truncate = OversizedSseStrategy.Truncate;
     OversizedSseStrategy deadLetter = OversizedSseStrategy.DeadLetter;
 
-    assertNotNull("FailStream should not be null", failStream);
-    assertNotNull("LogAndSkip should not be null", logAndSkip);
-    assertNotNull("Truncate should not be null", truncate);
-    assertNotNull("DeadLetter should not be null", deadLetter);
+    assertNotNull(failStream, "FailStream should not be null");
+    assertNotNull(logAndSkip, "LogAndSkip should not be null");
+    assertNotNull(truncate, "Truncate should not be null");
+    assertNotNull(deadLetter, "DeadLetter should not be null");
   }
 
   @Test
@@ -43,6 +42,6 @@ public class OversizedSseStrategySimpleTest extends JUnitSuite {
     OversizedSseStrategy strategy =
         OversizedSseStrategy.fromScala(
             org.apache.pekko.http.scaladsl.settings.OversizedSseStrategy.FailStream$.MODULE$);
-    assertEquals("Should convert from Scala FailStream", OversizedSseStrategy.FailStream, strategy);
+    assertEquals(OversizedSseStrategy.FailStream, strategy, "Should convert from Scala FailStream");
   }
 }
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/settings/RoutingSettingsTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/settings/RoutingSettingsTest.java
index f8ba29adf..d660ca045 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/settings/RoutingSettingsTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/settings/RoutingSettingsTest.java
@@ -16,10 +16,9 @@ package org.apache.pekko.http.javadsl.settings;
 import org.apache.pekko.actor.ActorSystem;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Test;
 
-public class RoutingSettingsTest extends JUnitSuite {
+public class RoutingSettingsTest {
 
   @Test
   public void testCreateWithActorSystem() {
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingOversizedTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingOversizedTest.java
index d4310abd6..266745353 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingOversizedTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingOversizedTest.java
@@ -20,25 +20,24 @@ package org.apache.pekko.http.javadsl.unmarshalling.sse;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.http.javadsl.settings.OversizedSseStrategy;
 import org.apache.pekko.http.javadsl.settings.ServerSentEventSettings;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class EventStreamUnmarshallingOversizedTest extends JUnitSuite {
+public class EventStreamUnmarshallingOversizedTest {
 
   private static ActorSystem system;
 
-  @BeforeClass
+  @BeforeAll
   public static void setup() {
     system = ActorSystem.create();
   }
 
-  @AfterClass
+  @AfterAll
   public static void teardown() throws Exception {
     system.terminate();
     system.getWhenTerminated().toCompletableFuture().get(5, TimeUnit.SECONDS);
@@ -52,30 +51,30 @@ public class EventStreamUnmarshallingOversizedTest extends JUnitSuite {
             .withLineLength(50)
             .withOversizedLineStrategy(OversizedSseStrategy.FailStream);
 
-    assertEquals("Should have correct line length", 50, settings.maxLineSize());
+    assertEquals(50, settings.maxLineSize(), "Should have correct line length");
     assertEquals(
-        "Should have FailStream line strategy",
         OversizedSseStrategy.FailStream,
-        settings.getOversizedLineStrategyEnum());
+        settings.getOversizedLineStrategyEnum(),
+        "Should have FailStream line strategy");
 
     // Test all strategies can be set
     settings = settings.withOversizedLineStrategy(OversizedSseStrategy.LogAndSkip);
     assertEquals(
-        "Should have LogAndSkip line strategy",
         OversizedSseStrategy.LogAndSkip,
-        settings.getOversizedLineStrategyEnum());
+        settings.getOversizedLineStrategyEnum(),
+        "Should have LogAndSkip line strategy");
 
     settings = settings.withOversizedLineStrategy(OversizedSseStrategy.Truncate);
     assertEquals(
-        "Should have Truncate line strategy",
         OversizedSseStrategy.Truncate,
-        settings.getOversizedLineStrategyEnum());
+        settings.getOversizedLineStrategyEnum(),
+        "Should have Truncate line strategy");
 
     settings = settings.withOversizedLineStrategy(OversizedSseStrategy.DeadLetter);
     assertEquals(
-        "Should have DeadLetter line strategy",
         OversizedSseStrategy.DeadLetter,
-        settings.getOversizedLineStrategyEnum());
+        settings.getOversizedLineStrategyEnum(),
+        "Should have DeadLetter line strategy");
   }
 
   @Test
@@ -85,12 +84,12 @@ public class EventStreamUnmarshallingOversizedTest extends JUnitSuite {
         ServerSentEventSettings.create(system).withOversizedLineStrategy("log-and-skip");
 
     assertEquals(
-        "Should have log-and-skip line strategy string",
         "log-and-skip",
-        settings.getOversizedLineStrategy());
+        settings.getOversizedLineStrategy(),
+        "Should have log-and-skip line strategy string");
     assertEquals(
-        "Should have LogAndSkip line strategy enum",
         OversizedSseStrategy.LogAndSkip,
-        settings.getOversizedLineStrategyEnum());
+        settings.getOversizedLineStrategyEnum(),
+        "Should have LogAndSkip line strategy enum");
   }
 }
diff --git a/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java b/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java
index a293b7604..a2284bab7 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java
@@ -24,13 +24,12 @@ import org.apache.pekko.http.javadsl.model.HttpEntity;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.http.javadsl.model.sse.ServerSentEvent;
 import org.apache.pekko.http.scaladsl.unmarshalling.sse.EventStreamUnmarshallingSpec;
-import org.junit.Assert;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import static scala.jdk.javaapi.FutureConverters.asJava;
 
-public class EventStreamUnmarshallingTest extends JUnitSuite {
+public class EventStreamUnmarshallingTest {
 
   @Test
   public void testFromEventsStream() throws Exception {
@@ -48,7 +47,7 @@ public class EventStreamUnmarshallingTest extends JUnitSuite {
               .get(3000, TimeUnit.SECONDS);
       // #event-stream-unmarshalling-example
 
-      Assert.assertEquals(events, unmarshalledEvents);
+      Assertions.assertEquals(events, unmarshalledEvents);
     } finally {
       asJava(system.terminate()).toCompletableFuture().get(42, TimeUnit.SECONDS);
     }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 6e37ef861..0a57f9855 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -22,6 +22,9 @@ object Dependencies {
   val jacksonDatabind3Version = "3.1.2"
   val jacksonXmlVersion = jacksonDatabindVersion
   val junitVersion = "4.13.2"
+  // sbt-jupiter-interface 0.11.0 requires JUnit 5.9.x; using 5.9.3 for compatibility
+  val junit5Version = "5.9.3"
+  val junitPlatformVersion = "1.9.3"
   val h2specVersion = "2.6.0"
   val h2specName = s"h2spec_${DependencyHelpers.osName}_amd64"
   val h2specExe = "h2spec" + DependencyHelpers.exeIfWindows
@@ -62,9 +65,12 @@ object Dependencies {
     // For pekko-http-jackson3 support
     val jacksonDatabind3 = "tools.jackson.core" % "jackson-databind" % jacksonDatabind3Version
 
-    // For pekko-http-testkit-java
+    // For pekko-http-testkit-java (JUnit 4 support for library users)
     val junit = "junit" % "junit" % junitVersion
 
+    // For pekko-http-testkit-java (JUnit 5 support for library users)
+    val junit5Api = "org.junit.jupiter" % "junit-jupiter-api" % junit5Version
+
     val caffeine = "com.github.ben-manes.caffeine" % "caffeine" % "3.2.3"
 
     val scalafix = "ch.epfl.scala" %% "scalafix-core" % Dependencies.scalafixVersion
@@ -87,6 +93,15 @@ object Dependencies {
       val scalacheck = "org.scalacheck" %% "scalacheck" % scalaCheckVersion % "test"
       val junitIntf = "com.github.sbt" % "junit-interface" % "0.13.3" % "test"
 
+      // JUnit 5 (Jupiter) dependencies for running tests
+      val junit5Api = Compile.junit5Api % "test"
+      val junit5Engine = "org.junit.jupiter" % "junit-jupiter-engine" % junit5Version % "test"
+      val junit5Params = "org.junit.jupiter" % "junit-jupiter-params" % junit5Version % "test"
+      val jupiterIntf = "net.aichler" % "jupiter-interface" % "0.11.1" % "test"
+      // Override platform-launcher to match our JUnit 5 version (jupiter-interface 0.11.1 pulls 1.9.1)
+      val junitPlatformLauncher =
+        "org.junit.platform" % "junit-platform-launcher" % junitPlatformVersion % "test"
+
       val scalatest = "org.scalatest" %% "scalatest" % scalaTestVersion % "test"
       val scalatestplusScalacheck = "org.scalatestplus" %% "scalacheck-1-19" % (scalaTestVersion + ".0") % "test"
       val scalatestplusJUnit = "org.scalatestplus" %% "junit-4-13" % (scalaTestVersion + ".0") % "test"
@@ -108,7 +123,8 @@ object Dependencies {
   lazy val httpCore = l ++= Seq(
     parboiled,
     Test.sprayJson, // for WS Autobahn test metadata
-    Test.scalatest, Test.scalatestplusScalacheck, Test.scalatestplusJUnit, Test.junit)
+    Test.scalatest, Test.scalatestplusScalacheck, Test.scalatestplusJUnit,
+    Test.junit5Api, Test.junit5Engine, Test.jupiterIntf, Test.junitPlatformLauncher)
 
   lazy val httpCaching = l ++= Seq(
     caffeine,
@@ -119,19 +135,22 @@ object Dependencies {
 
   lazy val http = Seq()
 
-  lazy val http2Tests = l ++= Seq(Test.h2spec)
+  lazy val http2Tests = l ++= Seq(Test.h2spec,
+    Test.junit5Api, Test.junit5Engine, Test.jupiterIntf, Test.junitPlatformLauncher)
 
   lazy val httpTestkit = Seq(
     versionDependentDeps(
       Test.specs2 % "provided; test"),
     l ++= Seq(
-      Test.junit, Test.junitIntf, Compile.junit % "provided",
+      Test.junit5Api, Test.junit5Engine, Test.jupiterIntf, Test.junitPlatformLauncher,
+      Test.junit, Test.junitIntf, Compile.junit % "provided", Compile.junit5Api % "provided",
       Test.scalatest.withConfigurations(Some("provided; test"))))
 
   lazy val httpTestkitMunit =
     l ++= Seq(Test.munit % "provided; test")
 
-  lazy val httpTests = l ++= Seq(Test.junit, Test.scalatest, Test.junitIntf)
+  lazy val httpTests = l ++=
+    Seq(Test.junit5Api, Test.junit5Engine, Test.jupiterIntf, Test.junitPlatformLauncher, Test.scalatest, Test.junitIntf)
 
   lazy val httpXml = Seq(
     versionDependentDeps(scalaXml),
@@ -141,11 +160,14 @@ object Dependencies {
     versionDependentDeps(sprayJson),
     libraryDependencies += Test.scalatest)
 
-  lazy val httpJackson = l ++= Seq(jacksonDatabind, Test.scalatestplusJUnit, Test.junit, Test.junitIntf)
+  lazy val httpJackson = l ++= Seq(jacksonDatabind, Test.scalatestplusJUnit,
+    Test.junit5Api, Test.junit5Engine, Test.jupiterIntf, Test.junitPlatformLauncher)
 
-  lazy val httpJackson3 = l ++= Seq(jacksonDatabind3, Test.scalatestplusJUnit, Test.junit, Test.junitIntf)
+  lazy val httpJackson3 = l ++= Seq(jacksonDatabind3, Test.scalatestplusJUnit,
+    Test.junit5Api, Test.junit5Engine, Test.jupiterIntf, Test.junitPlatformLauncher)
 
-  lazy val docs = l ++= Seq(Docs.sprayJson, Docs.gson, Docs.jacksonXml, Docs.reflections)
+  lazy val docs = l ++= Seq(Docs.sprayJson, Docs.gson, Docs.jacksonXml, Docs.reflections,
+    Test.junit5Api, Test.junit5Engine, Test.jupiterIntf, Test.junitPlatformLauncher)
 }
 
 object DependencyHelpers {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 29a8620aa..d71cab1a0 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -31,6 +31,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.6")
 addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.13")
 addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.4.7")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
+addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.18.0")
 
 // used in ValidatePullRequest to check github PR comments whether to build all subprojects
 libraryDependencies += "org.kohsuke" % "github-api" % "1.330"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org