diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index b9fcf769f1a10..04c826d1b782a 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -129,7 +129,7 @@
         <db2-jdbc.version>12.1.0.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
-        <junit.jupiter.version>5.13.4</junit.jupiter.version>
+        <junit.jupiter.version>6.0.1</junit.jupiter.version>
         <infinispan.version>16.0.3</infinispan.version>
         <infinispan.protostream.version>6.0.2</infinispan.protostream.version>
         <caffeine.version>3.2.3</caffeine.version>
@@ -382,7 +382,7 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- JUnit 5 dependencies, imported as a BOM -->
+            <!-- JUnit dependencies, imported as a BOM -->
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
@@ -605,11 +605,6 @@
                 <artifactId>quarkus-development-mode-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit4-mock</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-class-change-agent</artifactId>
@@ -3515,57 +3510,57 @@
             <!-- Quarkus test dependencies -->
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit5</artifactId>
+                <artifactId>quarkus-junit</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit5-config</artifactId>
+                <artifactId>quarkus-junit-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-test-security</artifactId>
+                <artifactId>quarkus-junit-component</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-test-security-jwt</artifactId>
+                <artifactId>quarkus-junit-internal</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-test-security-oidc</artifactId>
+                <artifactId>quarkus-junit-mockito</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-test-security-webauthn</artifactId>
+                <artifactId>quarkus-junit-mockito-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit5-component</artifactId>
+                <artifactId>quarkus-test-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit5-internal</artifactId>
+                <artifactId>quarkus-test-security</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-test-common</artifactId>
+                <artifactId>quarkus-test-security-jwt</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit5-mockito</artifactId>
+                <artifactId>quarkus-test-security-oidc</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit5-mockito-config</artifactId>
+                <artifactId>quarkus-test-security-webauthn</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -3649,8 +3644,8 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.quarkus.junit5</groupId>
-                <artifactId>junit5-virtual-threads</artifactId>
+                <groupId>io.quarkus.junit</groupId>
+                <artifactId>junit-virtual-threads</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -6604,6 +6599,42 @@
                 <artifactId>quarkus-vertx-http-dev-ui-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-junit5</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-junit5-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-junit5-component</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-junit5-internal</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-junit5-mockito</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-junit5-mockito-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus.junit</groupId>
+                <artifactId>junit-virtual-threads</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <!-- End of Relocations, please put new extensions above this list -->
 
         </dependencies>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 2635420097207..7fee445707387 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -82,7 +82,7 @@
         <opensearch-server.version>3.1.0</opensearch-server.version>
         <opensearch.image>docker.io/opensearchproject/opensearch:${opensearch-server.version}</opensearch.image>
         <opensearch.protocol>http</opensearch.protocol>
-        <junit-pioneer.version>2.2.0</junit-pioneer.version>
+        <junit-pioneer.version>2.3.0</junit-pioneer.version>
 
         <!-- Database images for JDBC/Reactive/Hibernate tests and devservices -->
         <postgres.image>docker.io/library/postgres:17</postgres.image>
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
index 19d2e7b098df2..9282b556ad24c 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
@@ -781,7 +781,7 @@ private DiscoveryResult discoverTestClasses() {
             // This is fine, and usually just means that test-framework/junit5 isn't one of the project dependencies
             // In that case, fallback to loading classes as we normally would, using a TCCL
             log.debug(
-                    "Could not load class for FacadeClassLoader. This might be because quarkus-junit5 is not on the project classpath: "
+                    "Could not load class for FacadeClassLoader. This might be because quarkus-junit is not on the project classpath: "
                             + e);
             log.debug(e);
             classLoaderForLoadingTests = Thread.currentThread()
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java
index 6c54654de8bc3..39324fea0a781 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java
@@ -46,7 +46,7 @@ public interface TestConfig {
      * The FQCN of the JUnit <code>ClassOrderer</code> to use. If the class cannot be found, it fallbacks to JUnit
      * default behaviour which does not set a <code>ClassOrderer</code> at all.
      *
-     * @see <a href=https://junit.org/junit5/docs/current/user-guide/#writing-tests-test-execution-order-classes>JUnit Class
+     * @see <a href=https://docs.junit.org/current/user-guide/#writing-tests-test-execution-order-classes>JUnit Class
      *      Order<a/>
      */
     @WithDefault("io.quarkus.test.junit.util.QuarkusTestProfileAwareClassOrderer")
@@ -55,7 +55,7 @@ public interface TestConfig {
     /**
      * Tags that should be included for continuous testing. This supports JUnit Tag Expressions.
      *
-     * @see <a href="https://junit.org/junit5/docs/current/user-guide/#running-tests-tag-expressions">JUnit Tag Expressions</a>
+     * @see <a href="https://docs.junit.org/current/user-guide/#running-tests-tag-expressions">JUnit Tag Expressions</a>
      */
     Optional<List<String>> includeTags();
 
@@ -68,7 +68,7 @@ public interface TestConfig {
      * <p>
      * This supports JUnit Tag Expressions.
      *
-     * @see <a href="https://junit.org/junit5/docs/current/user-guide/#running-tests-tag-expressions">JUnit Tag Expressions</a>
+     * @see <a href="https://docs.junit.org/current/user-guide/#running-tests-tag-expressions">JUnit Tag Expressions</a>
      */
     @WithDefault("slow")
     Optional<List<String>> excludeTags();
diff --git a/core/junit4-mock/pom.xml b/core/junit4-mock/pom.xml
deleted file mode 100644
index 4e94d0989ff92..0000000000000
--- a/core/junit4-mock/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-core-parent</artifactId>
-        <version>999-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>quarkus-junit4-mock</artifactId>
-    <name>Quarkus - JUnit 4 Mock</name>
-    <description>Module with some empty JUnit4 classes to allow Testcontainers
-    to run without needing to include JUnit4 on the class path</description>
-
-
-</project>
diff --git a/core/junit4-mock/src/main/java/org/junit/rules/ExternalResource.java b/core/junit4-mock/src/main/java/org/junit/rules/ExternalResource.java
deleted file mode 100644
index fde4eb436f3f9..0000000000000
--- a/core/junit4-mock/src/main/java/org/junit/rules/ExternalResource.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.junit.rules;
-
-public class ExternalResource {
-    protected void after() {
-
-    }
-}
diff --git a/core/junit4-mock/src/main/java/org/junit/rules/TestRule.java b/core/junit4-mock/src/main/java/org/junit/rules/TestRule.java
deleted file mode 100644
index ac06c7dcca136..0000000000000
--- a/core/junit4-mock/src/main/java/org/junit/rules/TestRule.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.junit.rules;
-
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-public interface TestRule {
-    Statement apply(Statement var1, Description var2);
-}
diff --git a/core/junit4-mock/src/main/java/org/junit/runner/Description.java b/core/junit4-mock/src/main/java/org/junit/runner/Description.java
deleted file mode 100644
index fcda478237136..0000000000000
--- a/core/junit4-mock/src/main/java/org/junit/runner/Description.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.junit.runner;
-
-public class Description {
-}
diff --git a/core/junit4-mock/src/main/java/org/junit/runners/model/Statement.java b/core/junit4-mock/src/main/java/org/junit/runners/model/Statement.java
deleted file mode 100644
index 09507a6991d67..0000000000000
--- a/core/junit4-mock/src/main/java/org/junit/runners/model/Statement.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.junit.runners.model;
-
-public abstract class Statement {
-    public Statement() {
-    }
-
-    public abstract void evaluate() throws Throwable;
-}
diff --git a/core/pom.xml b/core/pom.xml
index bd2477b254f75..4bcbd49234e2f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,6 +21,5 @@
         <module>devmode-spi</module>
         <module>launcher</module>
         <module>class-change-agent</module>
-        <module>junit4-mock</module>
     </modules>
 </project>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index f0397a9979665..a288b3e2464f1 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -144,9 +144,6 @@
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <configuration>
-                    <lesserPriorityArtifacts>
-                        <artifact>io.quarkus:quarkus-junit4-mock</artifact>
-                    </lesserPriorityArtifacts>
                     <parentFirstArtifacts>
                         <parentFirstArtifact>io.quarkus:quarkus-bootstrap-runner</parentFirstArtifact>
                         <parentFirstArtifact>io.quarkus:quarkus-classloader-commons</parentFirstArtifact>
@@ -206,7 +203,7 @@
                         <parentFirstArtifact>io.quarkus:quarkus-class-change-agent</parentFirstArtifact>
                         <parentFirstArtifact>org.jacoco:org.jacoco.agent:runtime</parentFirstArtifact>
                         <parentFirstArtifact>io.quarkus:quarkus-bootstrap-gradle-resolver</parentFirstArtifact>
-                        <parentFirstArtifact>io.quarkus:quarkus-junit5-mockito-config</parentFirstArtifact>
+                        <parentFirstArtifact>io.quarkus:quarkus-junit-mockito-config</parentFirstArtifact>
 
                         <!-- Load the junit engine parent first, so it is shared between the outer dev mode
                         process and the test application-->
diff --git a/devtools/gradle/gradle/libs.versions.toml b/devtools/gradle/gradle/libs.versions.toml
index 3f0bdc544bf32..2c1a345bef1e2 100644
--- a/devtools/gradle/gradle/libs.versions.toml
+++ b/devtools/gradle/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ plugin-publish = "2.0.0"
 kotlin = "2.2.21"
 smallrye-config = "3.14.1"
 
-junit5 = "5.13.4"
+junit = "6.0.1"
 assertj = "3.27.6"
 
 [plugins]
@@ -24,6 +24,6 @@ smallrye-config-yaml = { module = "io.smallrye.config:smallrye-config-source-yam
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
 jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml" }
 
-junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
diff --git a/docs/pom.xml b/docs/pom.xml
index 1e04a2e1858ef..272b325dc6b07 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -100,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Minimal test dependencies for consistent build order -->
diff --git a/docs/src/main/asciidoc/aws-lambda.adoc b/docs/src/main/asciidoc/aws-lambda.adoc
index 7fe1087152132..a400bd0b762b9 100644
--- a/docs/src/main/asciidoc/aws-lambda.adoc
+++ b/docs/src/main/asciidoc/aws-lambda.adoc
@@ -293,7 +293,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-resteasy'
     implementation 'io.quarkus:quarkus-amazon-lambda'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 ----
diff --git a/docs/src/main/asciidoc/building-my-first-extension.adoc b/docs/src/main/asciidoc/building-my-first-extension.adoc
index 6de3b80f1276e..6b74b89931223 100644
--- a/docs/src/main/asciidoc/building-my-first-extension.adoc
+++ b/docs/src/main/asciidoc/building-my-first-extension.adoc
@@ -263,7 +263,7 @@ Let's have a look at the deployment's `./greeting-extension/deployment/pom.xml`.
         </dependency>
         <dependency>
           <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-junit5-internal</artifactId>
+          <artifactId>quarkus-junit-internal</artifactId>
           <scope>test</scope>
         </dependency>
     </dependencies>
@@ -460,7 +460,7 @@ dependencies {
 
     implementation platform("io.quarkus:quarkus-bom:${quarkus.version}")
 
-    testImplementation 'io.quarkus:quarkus-junit5-internal'
+    testImplementation 'io.quarkus:quarkus-junit-internal'
 }
 ----
 
@@ -666,7 +666,7 @@ Now, Quarkus will process this new task which will result in the bytecode genera
 When developing a Quarkus extension, you mainly want to test your feature is properly deployed in an application and works as expected.
 That's why the tests will be hosted in the `deployment` module.
 
-Quarkus proposes facilities to test extensions via the `quarkus-junit5-internal` artifact (which should already be in the deployment pom.xml), in particular the `io.quarkus.test.QuarkusUnitTest` runner which starts an application with your extension.
+Quarkus proposes facilities to test extensions via the `quarkus-junit-internal` artifact (which should already be in the deployment pom.xml), in particular the `io.quarkus.test.QuarkusUnitTest` runner which starts an application with your extension.
 
 We will use https://rest-assured.io[RestAssured] (massively used in Quarkus) to test our HTTP endpoint.
 Let's add the `rest-assured` dependency into the  `./greeting-extension/deployment/pom.xml`.
diff --git a/docs/src/main/asciidoc/doc-contribute-docs-howto.adoc b/docs/src/main/asciidoc/doc-contribute-docs-howto.adoc
index 9500f2b1b02ee..b75d9cf743224 100644
--- a/docs/src/main/asciidoc/doc-contribute-docs-howto.adoc
+++ b/docs/src/main/asciidoc/doc-contribute-docs-howto.adoc
@@ -269,7 +269,7 @@ Our builds use https://vale.sh[Vale] to check grammar, style, and word usage in
 
 This approach requires a working container runtime (Docker or xref:podman.adoc[Podman]).
 
-The `docs` module has a JUnit 5 test that will run the Vale linter in a container (using https://www.testcontainers.org/[Testcontainers]).
+The `docs` module has a JUnit test that will run the Vale linter in a container (using https://www.testcontainers.org/[Testcontainers]).
 It verifies both Quarkus document metadata and Vale style rules.
 
 Run the test in one of the following ways:
diff --git a/docs/src/main/asciidoc/getting-started-testing.adoc b/docs/src/main/asciidoc/getting-started-testing.adoc
index 4e4afb794353e..2e072d1316736 100644
--- a/docs/src/main/asciidoc/getting-started-testing.adoc
+++ b/docs/src/main/asciidoc/getting-started-testing.adoc
@@ -57,7 +57,7 @@ In your build file you should see 2 test dependencies:
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5</artifactId>
+    <artifactId>quarkus-junit</artifactId>
     <scope>test</scope>
 </dependency>
 <dependency>
@@ -73,18 +73,18 @@ In your build file you should see 2 test dependencies:
 [source,groovy,subs=attributes+]
 ----
 dependencies {
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 ----
 ****
 
-`quarkus-junit5` is required for testing, as it provides the `@QuarkusTest` annotation that controls the testing framework.
+`quarkus-junit` is required for testing, as it provides the `@QuarkusTest` annotation that controls the testing framework.
 `rest-assured` is not required but is a convenient way to test HTTP endpoints, we also provide integration that automatically
 sets the correct URL so no configuration is required.
 
-Because we are using JUnit 5, the version of the https://maven.apache.org/surefire/maven-surefire-plugin/[Surefire Maven Plugin]
-must be set, as the default version does not support Junit 5:
+Because we are using JUnit, the version of the https://maven.apache.org/surefire/maven-surefire-plugin/[Surefire Maven Plugin]
+must be set, as the default version does not support JUnit:
 
 [source,xml,subs=attributes+]
 ----
@@ -470,11 +470,11 @@ a bit slower, as it adds a shutdown/startup cycle to the test time, but gives a
 
 To reduce the amount of times Quarkus needs to restart, `io.quarkus.test.junit.util.QuarkusTestProfileAwareClassOrderer`
 is registered as a global `ClassOrderer` as described in the
-link:https://junit.org/junit5/docs/current/user-guide/#writing-tests-test-execution-order-classes[JUnit 5 User Guide].
+link:https://docs.junit.org/current/user-guide/#writing-tests-test-execution-order-classes[JUnit User Guide].
 The behavior of this `ClassOrderer` is configurable via `application.properties` using the property
 `quarkus.test.class-orderer`. The property accepts the FQCN of the `ClassOrderer` to use. If the class cannot be found,
 it fallbacks to JUnit default behaviour which does not set a `ClassOrderer` at all. It can also be disabled entirely by
-setting another `ClassOrderer` that is provided by JUnit 5 or even your own custom one.
+setting another `ClassOrderer` that is provided by JUnit or even your own custom one.
 
 === Writing a Profile
 
@@ -704,7 +704,7 @@ matches the value of `quarkus.test.profile.tags`.
 
 == Nested Tests
 
-JUnit 5 https://junit.org/junit5/docs/current/user-guide/#writing-tests-nested[@Nested tests] are useful for structuring more complex test scenarios.
+JUnit https://docs.junit.org/current/user-guide/#writing-tests-nested[@Nested tests] are useful for structuring more complex test scenarios.
 However, note that it is not possible to assign different test profiles or resources to nested tests within the same parent class.
 
 == Mock Support
@@ -836,12 +836,12 @@ Building on the features provided by `QuarkusMock`, Quarkus also allows users to
 
 [IMPORTANT]
 ====
-This functionality is available with the `@io.quarkus.test.InjectMock` annotation **only if** the `quarkus-junit5-mockito` dependency is present:
+This functionality is available with the `@io.quarkus.test.InjectMock` annotation **only if** the `quarkus-junit-mockito` dependency is present:
 [source,xml]
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5-mockito</artifactId>
+    <artifactId>quarkus-junit-mockito</artifactId>
     <scope>test</scope>
 </dependency>
 ----
@@ -958,7 +958,7 @@ This is considered an advanced option and should only be performed if you fully
 ==== Using Spies instead of Mocks with `@InjectSpy`
 
 Building on the features provided by `InjectMock`, Quarkus also allows users to effortlessly take advantage of link:https://site.mockito.org/[Mockito] for spying on the beans supported by `QuarkusMock`.
-This functionality is available via the `@io.quarkus.test.junit.mockito.InjectSpy` annotation which is available in the `quarkus-junit5-mockito` dependency.
+This functionality is available via the `@io.quarkus.test.junit.mockito.InjectSpy` annotation which is available in the `quarkus-junit-mockito` dependency.
 
 Sometimes when testing you only need to verify that a certain logical path was taken, or you only need to stub out a single method's response while still executing the rest of the methods on the Spied clone. Please see link:https://javadoc.io/doc/org.mockito/mockito-core/latest/org/mockito/Mockito.html#13[Mockito documentation - Spying on real objects] for more details on Spy partial mocks.
 In either of those situations a Spy of the object is preferable.
@@ -1484,7 +1484,7 @@ while the latter three can coexist.
 The reason of this restriction is that `@QuarkusTest` starts a Quarkus server for the whole lifetime of the tests execution run,
 thus preventing the other tests to start their own Quarkus server.
 
-To alleviate this restriction, the `@QuarkusTest` annotation defines a JUnit 5 `@Tag`: `io.quarkus.test.junit.QuarkusTest`.
+To alleviate this restriction, the `@QuarkusTest` annotation defines a JUnit `@Tag`: `io.quarkus.test.junit.QuarkusTest`.
 You can use this tag to isolate the `@QuarkusTest` test in a specific execution run, for example with the Maven Surefire Plugin:
 
 [source,xml]
@@ -1699,7 +1699,7 @@ public @interface QuarkusSecurityTest {   <1>
 == Testing Components
 
 Quarkus provides the `QuarkusComponentTestExtension`, a JUnit extension to ease the testing of components and mocking of their dependencies.
-This JUnit extension is available in the `quarkus-junit5-component` dependency.
+This JUnit extension is available in the `quarkus-junit-component` dependency.
 
 Let's have a component `Foo` - a CDI bean with two injection points.
 
diff --git a/docs/src/main/asciidoc/getting-started.adoc b/docs/src/main/asciidoc/getting-started.adoc
index f2872b665b9ae..07479212c0c62 100644
--- a/docs/src/main/asciidoc/getting-started.adoc
+++ b/docs/src/main/asciidoc/getting-started.adoc
@@ -313,7 +313,7 @@ In the generated build file, you can see 2 test dependencies:
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5</artifactId>
+    <artifactId>quarkus-junit</artifactId>
     <scope>test</scope>
 </dependency>
 <dependency>
@@ -326,13 +326,13 @@ In the generated build file, you can see 2 test dependencies:
 [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"]
 .build.gradle
 ----
-testImplementation("io.quarkus:quarkus-junit5")
+testImplementation("io.quarkus:quarkus-junit")
 testImplementation("io.rest-assured:rest-assured")
 ----
 
-Quarkus supports https://junit.org/junit5/[JUnit 5] tests.
+Quarkus supports https://docs.junit.org/current/user-guide/[JUnit] tests.
 
-Because of this, in the case of Maven, the version of the https://maven.apache.org/surefire/maven-surefire-plugin/[Surefire Maven Plugin] must be set, as the default version does not support JUnit 5:
+Because of this, in the case of Maven, the version of the https://maven.apache.org/surefire/maven-surefire-plugin/[Surefire Maven Plugin] must be set, as the default version does not support JUnit:
 
 [source,xml,subs=attributes+]
 ----
diff --git a/docs/src/main/asciidoc/hibernate-orm-panache.adoc b/docs/src/main/asciidoc/hibernate-orm-panache.adoc
index 97035cde249f2..066a76ffe51ca 100644
--- a/docs/src/main/asciidoc/hibernate-orm-panache.adoc
+++ b/docs/src/main/asciidoc/hibernate-orm-panache.adoc
@@ -1327,14 +1327,14 @@ public class PanacheMockingTest {
 
 === Using the repository pattern
 
-If you are using the repository pattern you can use Mockito directly, using the `quarkus-junit5-mockito` module,
+If you are using the repository pattern you can use Mockito directly, using the `quarkus-junit-mockito` module,
 which makes mocking beans much easier:
 
 [source,xml]
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5-mockito</artifactId>
+    <artifactId>quarkus-junit-mockito</artifactId>
     <scope>test</scope>
 </dependency>
 ----
diff --git a/docs/src/main/asciidoc/hibernate-reactive-panache.adoc b/docs/src/main/asciidoc/hibernate-reactive-panache.adoc
index 268ca64a09605..cba0456b934be 100644
--- a/docs/src/main/asciidoc/hibernate-reactive-panache.adoc
+++ b/docs/src/main/asciidoc/hibernate-reactive-panache.adoc
@@ -1060,7 +1060,7 @@ what mock object to pass.
 
 === Using the repository pattern
 
-If you are using the repository pattern you can use Mockito directly, using the `quarkus-junit5-mockito` module,
+If you are using the repository pattern you can use Mockito directly, using the `quarkus-junit-mockito` module,
 which makes mocking beans much easier:
 
 [source,xml,role="primary asciidoc-tabs-target-sync-cli asciidoc-tabs-target-sync-maven"]
@@ -1068,7 +1068,7 @@ which makes mocking beans much easier:
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5-mockito</artifactId>
+    <artifactId>quarkus-junit-mockito</artifactId>
     <scope>test</scope>
 </dependency>
 ----
@@ -1076,7 +1076,7 @@ which makes mocking beans much easier:
 [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"]
 .build.gradle
 ----
-testImplementation("io.quarkus:quarkus-junit5-mockito")
+testImplementation("io.quarkus:quarkus-junit-mockito")
 ----
 
 Given this simple entity:
diff --git a/docs/src/main/asciidoc/jreleaser.adoc b/docs/src/main/asciidoc/jreleaser.adoc
index 49b328ec3bb93..a359b24807c38 100644
--- a/docs/src/main/asciidoc/jreleaser.adoc
+++ b/docs/src/main/asciidoc/jreleaser.adoc
@@ -668,7 +668,7 @@ As a reference, these are the full contents of the `pom.xml`:
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/docs/src/main/asciidoc/kotlin.adoc b/docs/src/main/asciidoc/kotlin.adoc
index 651cd0e63a592..64030e5dc1574 100644
--- a/docs/src/main/asciidoc/kotlin.adoc
+++ b/docs/src/main/asciidoc/kotlin.adoc
@@ -213,7 +213,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-rest-jackson'
     implementation 'io.quarkus:quarkus-kotlin'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
@@ -282,7 +282,7 @@ dependencies {
     implementation("io.quarkus:quarkus-rest")
     implementation("io.quarkus:quarkus-rest-jackson")
 
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/docs/src/main/asciidoc/mongodb-panache.adoc b/docs/src/main/asciidoc/mongodb-panache.adoc
index eaa6790f9286a..0dda68727ac6b 100644
--- a/docs/src/main/asciidoc/mongodb-panache.adoc
+++ b/docs/src/main/asciidoc/mongodb-panache.adoc
@@ -1118,7 +1118,7 @@ what mock object to pass.
 
 === Using the repository pattern
 
-If you are using the repository pattern you can use Mockito directly, using the `quarkus-junit5-mockito` module,
+If you are using the repository pattern you can use Mockito directly, using the `quarkus-junit-mockito` module,
 which makes mocking beans much easier:
 
 [source,xml,role="primary asciidoc-tabs-target-sync-cli asciidoc-tabs-target-sync-maven"]
@@ -1126,7 +1126,7 @@ which makes mocking beans much easier:
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5-mockito</artifactId>
+    <artifactId>quarkus-junit-mockito</artifactId>
     <scope>test</scope>
 </dependency>
 ----
@@ -1134,7 +1134,7 @@ which makes mocking beans much easier:
 [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"]
 .build.gradle
 ----
-testImplementation("io.quarkus:quarkus-junit5-mockito")
+testImplementation("io.quarkus:quarkus-junit-mockito")
 ----
 
 Given this simple entity:
diff --git a/docs/src/main/asciidoc/rest-client.adoc b/docs/src/main/asciidoc/rest-client.adoc
index 8a3d95935d823..da83c28df9b2a 100644
--- a/docs/src/main/asciidoc/rest-client.adoc
+++ b/docs/src/main/asciidoc/rest-client.adoc
@@ -1977,7 +1977,7 @@ First, add the following dependency to your application:
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5-mockito</artifactId>
+    <artifactId>quarkus-junit-mockito</artifactId>
     <scope>test</scope>
 </dependency>
 ----
@@ -1985,7 +1985,7 @@ First, add the following dependency to your application:
 [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"]
 .build.gradle
 ----
-testImplementation("io.quarkus:quarkus-junit5-mockito")
+testImplementation("io.quarkus:quarkus-junit-mockito")
 ----
 
 Then, in your test you can simply use `@InjectMock` to create and inject a mock:
diff --git a/docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc b/docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc
index 3b1bb8a6fa484..5c31a220c9cf4 100644
--- a/docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc
+++ b/docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc
@@ -586,7 +586,7 @@ You can begin testing by adding the following dependencies to your test project:
 </dependency>
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5</artifactId>
+    <artifactId>quarkus-junit</artifactId>
     <scope>test</scope>
 </dependency>
 ----
@@ -595,7 +595,7 @@ You can begin testing by adding the following dependencies to your test project:
 .build.gradle
 ----
 testImplementation("io.rest-assured:rest-assured")
-testImplementation("io.quarkus:quarkus-junit5")
+testImplementation("io.quarkus:quarkus-junit")
 ----
 
 [[bearer-token-integration-testing-keycloak-devservices]]
diff --git a/docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc b/docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc
index d0b691650bd24..240bdcfce6a04 100644
--- a/docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc
+++ b/docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc
@@ -2028,7 +2028,7 @@ Start by adding the following dependencies to your test project:
 </dependency>
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5</artifactId>
+    <artifactId>quarkus-junit</artifactId>
     <scope>test</scope>
 </dependency>
 ----
@@ -2037,7 +2037,7 @@ Start by adding the following dependencies to your test project:
 .build.gradle
 ----
 testImplementation("org.htmlunit:htmlunit")
-testImplementation("io.quarkus:quarkus-junit5")
+testImplementation("io.quarkus:quarkus-junit")
 ----
 
 [[code-flow-integration-testing-keycloak-devservices]]
diff --git a/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc b/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc
index fe0785d28482f..79e8c479f1494 100644
--- a/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc
+++ b/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc
@@ -1139,7 +1139,7 @@ Start by adding the following dependencies to your test project:
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-junit5</artifactId>
+    <artifactId>quarkus-junit</artifactId>
     <scope>test</scope>
 </dependency>
 <dependency>
diff --git a/docs/src/main/asciidoc/testing-components.adoc b/docs/src/main/asciidoc/testing-components.adoc
index 1d3f47f64bbd1..7c8da8067b7e5 100644
--- a/docs/src/main/asciidoc/testing-components.adoc
+++ b/docs/src/main/asciidoc/testing-components.adoc
@@ -18,7 +18,7 @@ Therefore, Quarkus provides `QuarkusComponentTestExtension` - a JUnit extension
 Unlike `@QuarkusTest` this extension does not start a full Quarkus application but merely the CDI container and the configuration service.
 You can find more details in the <<lifecycle>> section.
 
-TIP: This JUnit extension is available in the `quarkus-junit5-component` dependency.
+TIP: This JUnit extension is available in the `quarkus-junit-component` dependency.
 
 == Basic example
 
@@ -234,7 +234,7 @@ You can use the mock configurator API via the `QuarkusComponentTestExtensionBuil
 
 == Nested Tests
 
-JUnit 5 https://junit.org/junit5/docs/current/user-guide/#writing-tests-nested[@Nested tests] may help to structure more complex test scenarios.
+JUnit https://docs.junit.org/current/user-guide/#writing-tests-nested[@Nested tests] may help to structure more complex test scenarios.
 However, only basic use cases are tested with `@QuarkusComponentTest`.
 
 .Nested test
diff --git a/docs/src/main/asciidoc/tests-with-coverage.adoc b/docs/src/main/asciidoc/tests-with-coverage.adoc
index d1bceb1b2b423..ccda7437bf9a4 100644
--- a/docs/src/main/asciidoc/tests-with-coverage.adoc
+++ b/docs/src/main/asciidoc/tests-with-coverage.adoc
@@ -31,7 +31,7 @@ include::{includes}/prerequisites.adoc[]
 == Architecture
 
 The application built in this guide is just a Jakarta REST endpoint (hello world) that relies on dependency injection to use a service.
-The service will be tested with JUnit 5 and the endpoint will be annotated via a `@QuarkusTest` annotation.
+The service will be tested with JUnit and the endpoint will be annotated via a `@QuarkusTest` annotation.
 
 == Solution
 
diff --git a/docs/src/main/asciidoc/virtual-threads.adoc b/docs/src/main/asciidoc/virtual-threads.adoc
index 0183f7c38c262..3aadf8617386a 100644
--- a/docs/src/main/asciidoc/virtual-threads.adoc
+++ b/docs/src/main/asciidoc/virtual-threads.adoc
@@ -490,22 +490,22 @@ public class MyApplication {
 == Testing virtual thread applications
 
 As mentioned above, virtual threads have a few limitations that can drastically affect your application performance and memory usage.
-The _junit5-virtual-threads_ extension provides a way to detect pinned carrier threads while running your tests.
+The _junit-virtual-threads_ extension provides a way to detect pinned carrier threads while running your tests.
 Thus, you can eliminate one of the most prominent limitations or be aware of the problem.
 
 To enable this detection:
 
-* 1) Add the `junit5-virtual-threads` dependency to your project:
+* 1) Add the `junit-virtual-threads` dependency to your project:
 [source, xml]
 ----
 <dependency>
-    <groupId>io.quarkus.junit5</groupId>
-    <artifactId>junit5-virtual-threads</artifactId>
+    <groupId>io.quarkus.junit</groupId>
+    <artifactId>junit-virtual-threads</artifactId>
     <scope>test</scope>
 </dependency>
 ----
 
-* 2) In your test case, add the `io.quarkus.test.junit5.virtual.VirtualThreadUnit`  and `io.quarkus.test.junit.virtual.ShouldNotPin` annotations:
+* 2) In your test case, add the `io.quarkus.test.junit.virtual.VirtualThreadUnit`  and `io.quarkus.test.junit.virtual.ShouldNotPin` annotations:
 [source, java]
 ----
 @QuarkusTest
@@ -522,7 +522,7 @@ When it happens, the test fails.
 
 The `@ShouldNotPin` can also be used on methods directly.
 
-The _junit5-virtual-threads_ also provides a `@ShouldPin` annotation for cases where pinning is unavoidable.
+The _junit-virtual-threads_ also provides a `@ShouldPin` annotation for cases where pinning is unavoidable.
 The following snippet demonstrates the `@ShouldPin` annotation usage.
 
 // This is not possible because of a classloading issue - See https://github.com/quarkusio/quarkus/issues/36569 :
diff --git a/docs/src/main/asciidoc/writing-extensions.adoc b/docs/src/main/asciidoc/writing-extensions.adoc
index 21beebb130a03..18e71b4536e00 100644
--- a/docs/src/main/asciidoc/writing-extensions.adoc
+++ b/docs/src/main/asciidoc/writing-extensions.adoc
@@ -2117,7 +2117,7 @@ See xref:extension-writing-dev-service.adoc[how to write a Dev Service] for more
 [[testing-extensions]]
 === Testing Extensions
 
-Testing of Quarkus extensions should be done with the `io.quarkus.test.QuarkusUnitTest` JUnit 5 extension.
+Testing of Quarkus extensions should be done with the `io.quarkus.test.QuarkusUnitTest` JUnit extension.
 This extension allows for Arquillian-style tests that test specific functionalities.
 It is not intended for testing user applications, as this should be done via `io.quarkus.test.junit.QuarkusTest`.
 The main difference is that `QuarkusTest` simply boots the application once at the start of the run, while `QuarkusUnitTest` deploys a custom
@@ -2126,7 +2126,7 @@ Quarkus application for each test class.
 These tests should be placed in the deployment module, if additional Quarkus modules are required for testing
 their deployment modules should also be added as test scoped dependencies.
 
-Note that `QuarkusUnitTest` is in the `quarkus-junit5-internal` module.
+Note that `QuarkusUnitTest` is in the `quarkus-junit-internal` module.
 
 An example test class may look like:
 
diff --git a/extensions/agroal/deployment/pom.xml b/extensions/agroal/deployment/pom.xml
index ac448c706702e..5a03eac7c20a5 100644
--- a/extensions/agroal/deployment/pom.xml
+++ b/extensions/agroal/deployment/pom.xml
@@ -76,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/agroal/runtime/pom.xml b/extensions/agroal/runtime/pom.xml
index 72a2be3bbbfc6..e667b7a182579 100644
--- a/extensions/agroal/runtime/pom.xml
+++ b/extensions/agroal/runtime/pom.xml
@@ -67,7 +67,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/extensions/agroal/spi/pom.xml b/extensions/agroal/spi/pom.xml
index dc8fe8e1ef587..dae88ac9aefdb 100644
--- a/extensions/agroal/spi/pom.xml
+++ b/extensions/agroal/spi/pom.xml
@@ -24,7 +24,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 01c9ac4d48e4e..414566b382eb5 100644
--- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 3b68486fa477b..aab3604071ada 100644
--- a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/amazon-lambda/common-deployment/pom.xml b/extensions/amazon-lambda/common-deployment/pom.xml
index dba760ca81614..9def9361b322b 100644
--- a/extensions/amazon-lambda/common-deployment/pom.xml
+++ b/extensions/amazon-lambda/common-deployment/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/amazon-lambda/deployment/pom.xml b/extensions/amazon-lambda/deployment/pom.xml
index 2eb03cfce23ff..003a03acb461c 100644
--- a/extensions/amazon-lambda/deployment/pom.xml
+++ b/extensions/amazon-lambda/deployment/pom.xml
@@ -37,12 +37,12 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle
index cf765452594dd..24c2150174c59 100644
--- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle
+++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-amazon-lambda'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
index e2814034fb0f4..fde35fbb42e53 100644
--- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/arc/deployment/pom.xml b/extensions/arc/deployment/pom.xml
index 55c07286bfcfe..31c43bc4bf912 100644
--- a/extensions/arc/deployment/pom.xml
+++ b/extensions/arc/deployment/pom.xml
@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/assistant/deployment/pom.xml b/extensions/assistant/deployment/pom.xml
index 8775d9684540a..6af1a0f979fac 100644
--- a/extensions/assistant/deployment/pom.xml
+++ b/extensions/assistant/deployment/pom.xml
@@ -31,7 +31,7 @@
         <!-- Test -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/avro/deployment/pom.xml b/extensions/avro/deployment/pom.xml
index b77775fc9a871..b18590af96262 100644
--- a/extensions/avro/deployment/pom.xml
+++ b/extensions/avro/deployment/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/awt/deployment/pom.xml b/extensions/awt/deployment/pom.xml
index 313f26f4599c3..4826cfd10d5bb 100644
--- a/extensions/awt/deployment/pom.xml
+++ b/extensions/awt/deployment/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/cache/deployment/pom.xml b/extensions/cache/deployment/pom.xml
index dfa3b265c109e..0e2ec06feda15 100644
--- a/extensions/cache/deployment/pom.xml
+++ b/extensions/cache/deployment/pom.xml
@@ -64,7 +64,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/config-yaml/deployment/pom.xml b/extensions/config-yaml/deployment/pom.xml
index aa2ba2d1ee311..f4a91bc20c042 100644
--- a/extensions/config-yaml/deployment/pom.xml
+++ b/extensions/config-yaml/deployment/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/container-image/container-image-openshift/deployment/pom.xml b/extensions/container-image/container-image-openshift/deployment/pom.xml
index c0458deba5dfc..0880f833d2175 100644
--- a/extensions/container-image/container-image-openshift/deployment/pom.xml
+++ b/extensions/container-image/container-image-openshift/deployment/pom.xml
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/container-image/deployment/pom.xml b/extensions/container-image/deployment/pom.xml
index 2a3ca55a0b465..a527a639cdc2b 100644
--- a/extensions/container-image/deployment/pom.xml
+++ b/extensions/container-image/deployment/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/devservices/common/pom.xml b/extensions/devservices/common/pom.xml
index c2d1a90aa21e8..8c1cf03d7b9f3 100644
--- a/extensions/devservices/common/pom.xml
+++ b/extensions/devservices/common/pom.xml
@@ -31,10 +31,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
diff --git a/extensions/devservices/deployment/pom.xml b/extensions/devservices/deployment/pom.xml
index 7c2f52c5a3f3a..e8ff78639c19e 100644
--- a/extensions/devservices/deployment/pom.xml
+++ b/extensions/devservices/deployment/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/devui/deployment/pom.xml b/extensions/devui/deployment/pom.xml
index af6cc8cd92d28..19a83e280275a 100644
--- a/extensions/devui/deployment/pom.xml
+++ b/extensions/devui/deployment/pom.xml
@@ -69,12 +69,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/devui/test-spi/pom.xml b/extensions/devui/test-spi/pom.xml
index de0de6d3d7027..ccabc9df5912a 100644
--- a/extensions/devui/test-spi/pom.xml
+++ b/extensions/devui/test-spi/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-config</artifactId>
+            <artifactId>quarkus-junit-config</artifactId>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
diff --git a/extensions/elasticsearch-rest-client/deployment/pom.xml b/extensions/elasticsearch-rest-client/deployment/pom.xml
index 8ee15d8d4f419..52782c0d1ce57 100644
--- a/extensions/elasticsearch-rest-client/deployment/pom.xml
+++ b/extensions/elasticsearch-rest-client/deployment/pom.xml
@@ -38,7 +38,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/elytron-security-common/runtime/pom.xml b/extensions/elytron-security-common/runtime/pom.xml
index f2faa3efd3380..ae6073e1d163d 100644
--- a/extensions/elytron-security-common/runtime/pom.xml
+++ b/extensions/elytron-security-common/runtime/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/elytron-security-jdbc/deployment/pom.xml b/extensions/elytron-security-jdbc/deployment/pom.xml
index 69fa9594ae2bd..05d3454e02f21 100644
--- a/extensions/elytron-security-jdbc/deployment/pom.xml
+++ b/extensions/elytron-security-jdbc/deployment/pom.xml
@@ -48,12 +48,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/elytron-security-ldap/deployment/pom.xml b/extensions/elytron-security-ldap/deployment/pom.xml
index 00307cca2130d..297ab3a7975a1 100644
--- a/extensions/elytron-security-ldap/deployment/pom.xml
+++ b/extensions/elytron-security-ldap/deployment/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/elytron-security-oauth2/deployment/pom.xml b/extensions/elytron-security-oauth2/deployment/pom.xml
index 7aa85344d655c..71f48f8276d91 100644
--- a/extensions/elytron-security-oauth2/deployment/pom.xml
+++ b/extensions/elytron-security-oauth2/deployment/pom.xml
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/elytron-security-properties-file/deployment/pom.xml b/extensions/elytron-security-properties-file/deployment/pom.xml
index 2d450894891a8..372f0ac5e0ad5 100644
--- a/extensions/elytron-security-properties-file/deployment/pom.xml
+++ b/extensions/elytron-security-properties-file/deployment/pom.xml
@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/elytron-security/deployment/pom.xml b/extensions/elytron-security/deployment/pom.xml
index 7b6b2b4e29164..e58c88dc83164 100644
--- a/extensions/elytron-security/deployment/pom.xml
+++ b/extensions/elytron-security/deployment/pom.xml
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/elytron-security/runtime/pom.xml b/extensions/elytron-security/runtime/pom.xml
index b0b27e476033b..e5bed88e40fb9 100644
--- a/extensions/elytron-security/runtime/pom.xml
+++ b/extensions/elytron-security/runtime/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/flyway/deployment/pom.xml b/extensions/flyway/deployment/pom.xml
index 2cd130cef47ca..f70c9f046724e 100644
--- a/extensions/flyway/deployment/pom.xml
+++ b/extensions/flyway/deployment/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/flyway/runtime/pom.xml b/extensions/flyway/runtime/pom.xml
index 8d4fcb05bd482..02f3b380ee618 100644
--- a/extensions/flyway/runtime/pom.xml
+++ b/extensions/flyway/runtime/pom.xml
@@ -52,7 +52,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/funqy/funqy-amazon-lambda/deployment/pom.xml b/extensions/funqy/funqy-amazon-lambda/deployment/pom.xml
index c0d5463ef9e70..2a9d405607a92 100644
--- a/extensions/funqy/funqy-amazon-lambda/deployment/pom.xml
+++ b/extensions/funqy/funqy-amazon-lambda/deployment/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/funqy/funqy-http/deployment/pom.xml b/extensions/funqy/funqy-http/deployment/pom.xml
index 9558d9339c68e..415ac1d00a3d1 100644
--- a/extensions/funqy/funqy-http/deployment/pom.xml
+++ b/extensions/funqy/funqy-http/deployment/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/funqy/funqy-knative-events/deployment/pom.xml b/extensions/funqy/funqy-knative-events/deployment/pom.xml
index b28d16b578f00..dd5a23f1c945f 100644
--- a/extensions/funqy/funqy-knative-events/deployment/pom.xml
+++ b/extensions/funqy/funqy-knative-events/deployment/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/funqy/funqy-server-common/deployment/pom.xml b/extensions/funqy/funqy-server-common/deployment/pom.xml
index 3e51278b52a7f..c066742df1daf 100644
--- a/extensions/funqy/funqy-server-common/deployment/pom.xml
+++ b/extensions/funqy/funqy-server-common/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/funqy/funqy-server-common/runtime/pom.xml b/extensions/funqy/funqy-server-common/runtime/pom.xml
index edae768348ab0..02a431c36e5c1 100644
--- a/extensions/funqy/funqy-server-common/runtime/pom.xml
+++ b/extensions/funqy/funqy-server-common/runtime/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml
index 8255a43f70860..d93f936906e3c 100644
--- a/extensions/grpc/deployment/pom.xml
+++ b/extensions/grpc/deployment/pom.xml
@@ -76,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml
index 656f2ed29a2e1..122da20266900 100644
--- a/extensions/grpc/runtime/pom.xml
+++ b/extensions/grpc/runtime/pom.xml
@@ -108,7 +108,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/hal/deployment/pom.xml b/extensions/hal/deployment/pom.xml
index dde2d68dd266a..f151d124ec732 100644
--- a/extensions/hal/deployment/pom.xml
+++ b/extensions/hal/deployment/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/hibernate-envers/deployment/pom.xml b/extensions/hibernate-envers/deployment/pom.xml
index 7fe25961b10a1..e18b2854fb65f 100644
--- a/extensions/hibernate-envers/deployment/pom.xml
+++ b/extensions/hibernate-envers/deployment/pom.xml
@@ -30,7 +30,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/hibernate-orm/deployment/pom.xml b/extensions/hibernate-orm/deployment/pom.xml
index 86de98c504ca5..97a5e82e5564d 100644
--- a/extensions/hibernate-orm/deployment/pom.xml
+++ b/extensions/hibernate-orm/deployment/pom.xml
@@ -68,7 +68,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -99,7 +99,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/hibernate-orm/runtime/pom.xml b/extensions/hibernate-orm/runtime/pom.xml
index c7344c3b9cdf8..da139d9c49fab 100644
--- a/extensions/hibernate-orm/runtime/pom.xml
+++ b/extensions/hibernate-orm/runtime/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/hibernate-reactive/deployment/pom.xml b/extensions/hibernate-reactive/deployment/pom.xml
index 1b7e22d1395d1..3612421416abe 100644
--- a/extensions/hibernate-reactive/deployment/pom.xml
+++ b/extensions/hibernate-reactive/deployment/pom.xml
@@ -66,7 +66,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml
index 067abe99f0120..24390db600a39 100644
--- a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml
@@ -49,7 +49,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/hibernate-search-orm-outbox-polling/deployment/pom.xml b/extensions/hibernate-search-orm-outbox-polling/deployment/pom.xml
index 587aa39608661..b3d9f2532049d 100644
--- a/extensions/hibernate-search-orm-outbox-polling/deployment/pom.xml
+++ b/extensions/hibernate-search-orm-outbox-polling/deployment/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/hibernate-search-standalone-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-standalone-elasticsearch/deployment/pom.xml
index c8eff148ecf06..c22c05ce5fe99 100644
--- a/extensions/hibernate-search-standalone-elasticsearch/deployment/pom.xml
+++ b/extensions/hibernate-search-standalone-elasticsearch/deployment/pom.xml
@@ -45,7 +45,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/hibernate-validator/deployment/pom.xml b/extensions/hibernate-validator/deployment/pom.xml
index 3b525bd111dbc..6cf37cb8aa3cc 100644
--- a/extensions/hibernate-validator/deployment/pom.xml
+++ b/extensions/hibernate-validator/deployment/pom.xml
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/infinispan-cache/deployment/pom.xml b/extensions/infinispan-cache/deployment/pom.xml
index d75ddb30bb259..7df787214c9b3 100644
--- a/extensions/infinispan-cache/deployment/pom.xml
+++ b/extensions/infinispan-cache/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/infinispan-client/deployment/pom.xml b/extensions/infinispan-client/deployment/pom.xml
index 313b7b118aa4f..3a477bcda133a 100644
--- a/extensions/infinispan-client/deployment/pom.xml
+++ b/extensions/infinispan-client/deployment/pom.xml
@@ -94,7 +94,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml
index ea43893ee3067..218cf35cef285 100644
--- a/extensions/infinispan-client/runtime/pom.xml
+++ b/extensions/infinispan-client/runtime/pom.xml
@@ -138,7 +138,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/info/deployment/pom.xml b/extensions/info/deployment/pom.xml
index 1e852cc47cc12..8c4683d730947 100644
--- a/extensions/info/deployment/pom.xml
+++ b/extensions/info/deployment/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jackson/deployment/pom.xml b/extensions/jackson/deployment/pom.xml
index 36d5510452b79..448c3ae3d33d9 100644
--- a/extensions/jackson/deployment/pom.xml
+++ b/extensions/jackson/deployment/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jaxb/deployment/pom.xml b/extensions/jaxb/deployment/pom.xml
index 53d532adc436b..35d27c455cd25 100644
--- a/extensions/jaxb/deployment/pom.xml
+++ b/extensions/jaxb/deployment/pom.xml
@@ -31,7 +31,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jdbc/jdbc-db2/deployment/pom.xml b/extensions/jdbc/jdbc-db2/deployment/pom.xml
index 347b5d6a3640b..ea9e5ca4713ab 100644
--- a/extensions/jdbc/jdbc-db2/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-db2/deployment/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jdbc/jdbc-mariadb/deployment/pom.xml b/extensions/jdbc/jdbc-mariadb/deployment/pom.xml
index 1cb3db3aa2b74..4f784c7da1b6e 100644
--- a/extensions/jdbc/jdbc-mariadb/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-mariadb/deployment/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jdbc/jdbc-mssql/deployment/pom.xml b/extensions/jdbc/jdbc-mssql/deployment/pom.xml
index 4b612844deca8..2ee77b30396cd 100644
--- a/extensions/jdbc/jdbc-mssql/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-mssql/deployment/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jdbc/jdbc-mysql/deployment/pom.xml b/extensions/jdbc/jdbc-mysql/deployment/pom.xml
index 2cf2ff69bdb02..155bc119cad62 100644
--- a/extensions/jdbc/jdbc-mysql/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-mysql/deployment/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jdbc/jdbc-oracle/deployment/pom.xml b/extensions/jdbc/jdbc-oracle/deployment/pom.xml
index 3c4e1d16fc954..128dc58b8412b 100644
--- a/extensions/jdbc/jdbc-oracle/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-oracle/deployment/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jdbc/jdbc-postgresql/deployment/pom.xml b/extensions/jdbc/jdbc-postgresql/deployment/pom.xml
index 308ea769bf025..20dd0fb9ca179 100644
--- a/extensions/jdbc/jdbc-postgresql/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-postgresql/deployment/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
index 9aa0461ad0c72..0a6dd3a00a787 100644
--- a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/jfr/deployment/pom.xml b/extensions/jfr/deployment/pom.xml
index 51c183e26e533..2af114ee2c4c8 100644
--- a/extensions/jfr/deployment/pom.xml
+++ b/extensions/jfr/deployment/pom.xml
@@ -31,7 +31,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/extensions/jsonb/deployment/pom.xml b/extensions/jsonb/deployment/pom.xml
index 459d613b94431..337cd9ef99e46 100644
--- a/extensions/jsonb/deployment/pom.xml
+++ b/extensions/jsonb/deployment/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/kafka-client/deployment/pom.xml b/extensions/kafka-client/deployment/pom.xml
index 3831140ac9fcd..9bfda25c86f14 100644
--- a/extensions/kafka-client/deployment/pom.xml
+++ b/extensions/kafka-client/deployment/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -63,10 +63,6 @@
             <groupId>io.strimzi</groupId>
             <artifactId>strimzi-test-container</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-devservices-deployment</artifactId>
diff --git a/extensions/kafka-client/runtime/pom.xml b/extensions/kafka-client/runtime/pom.xml
index be23a5c2c6742..614edf9846f12 100644
--- a/extensions/kafka-client/runtime/pom.xml
+++ b/extensions/kafka-client/runtime/pom.xml
@@ -70,7 +70,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/kafka-streams/deployment/pom.xml b/extensions/kafka-streams/deployment/pom.xml
index 98166b82deeb6..79271c8f1f338 100644
--- a/extensions/kafka-streams/deployment/pom.xml
+++ b/extensions/kafka-streams/deployment/pom.xml
@@ -45,7 +45,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/kafka-streams/runtime-dev/pom.xml b/extensions/kafka-streams/runtime-dev/pom.xml
index 68eb4f86da467..d244af74e71a6 100644
--- a/extensions/kafka-streams/runtime-dev/pom.xml
+++ b/extensions/kafka-streams/runtime-dev/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/kafka-streams/runtime/pom.xml b/extensions/kafka-streams/runtime/pom.xml
index 4847546f0d8d7..4c58fb5447a90 100644
--- a/extensions/kafka-streams/runtime/pom.xml
+++ b/extensions/kafka-streams/runtime/pom.xml
@@ -42,7 +42,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/keycloak-admin-client-common/deployment/pom.xml b/extensions/keycloak-admin-client-common/deployment/pom.xml
index eb3187ea0436f..f5124b9ddc3c4 100644
--- a/extensions/keycloak-admin-client-common/deployment/pom.xml
+++ b/extensions/keycloak-admin-client-common/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/keycloak-admin-rest-client/deployment/pom.xml b/extensions/keycloak-admin-rest-client/deployment/pom.xml
index 29e4a7f628033..d31f6247d4d17 100644
--- a/extensions/keycloak-admin-rest-client/deployment/pom.xml
+++ b/extensions/keycloak-admin-rest-client/deployment/pom.xml
@@ -40,7 +40,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/keycloak-admin-resteasy-client/deployment/pom.xml b/extensions/keycloak-admin-resteasy-client/deployment/pom.xml
index 041e5cf1a025b..9d7c14bdc5fe0 100644
--- a/extensions/keycloak-admin-resteasy-client/deployment/pom.xml
+++ b/extensions/keycloak-admin-resteasy-client/deployment/pom.xml
@@ -48,7 +48,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/keycloak-authorization/deployment/pom.xml b/extensions/keycloak-authorization/deployment/pom.xml
index c76a2ada27e1d..4d51358269fce 100644
--- a/extensions/keycloak-authorization/deployment/pom.xml
+++ b/extensions/keycloak-authorization/deployment/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/kubernetes-client/deployment/pom.xml b/extensions/kubernetes-client/deployment/pom.xml
index 09b5fa07c905a..5cf5915d280de 100644
--- a/extensions/kubernetes-client/deployment/pom.xml
+++ b/extensions/kubernetes-client/deployment/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/kubernetes/openshift/deployment/pom.xml b/extensions/kubernetes/openshift/deployment/pom.xml
index f2a48b367751e..621a458efd1cc 100644
--- a/extensions/kubernetes/openshift/deployment/pom.xml
+++ b/extensions/kubernetes/openshift/deployment/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/kubernetes/vanilla/deployment/pom.xml b/extensions/kubernetes/vanilla/deployment/pom.xml
index 6bdefef5ba11b..deb3ef86e34f4 100644
--- a/extensions/kubernetes/vanilla/deployment/pom.xml
+++ b/extensions/kubernetes/vanilla/deployment/pom.xml
@@ -112,7 +112,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/liquibase/liquibase-mongodb/runtime/pom.xml b/extensions/liquibase/liquibase-mongodb/runtime/pom.xml
index 75a6913e02418..df1a11d2666f1 100644
--- a/extensions/liquibase/liquibase-mongodb/runtime/pom.xml
+++ b/extensions/liquibase/liquibase-mongodb/runtime/pom.xml
@@ -56,7 +56,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/liquibase/liquibase/deployment/pom.xml b/extensions/liquibase/liquibase/deployment/pom.xml
index ba9d17ccc3636..c6a60b16416a6 100644
--- a/extensions/liquibase/liquibase/deployment/pom.xml
+++ b/extensions/liquibase/liquibase/deployment/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/liquibase/liquibase/runtime/pom.xml b/extensions/liquibase/liquibase/runtime/pom.xml
index 8ce094b7dae5b..83e4ad1190281 100644
--- a/extensions/liquibase/liquibase/runtime/pom.xml
+++ b/extensions/liquibase/liquibase/runtime/pom.xml
@@ -68,7 +68,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/load-shedding/deployment/pom.xml b/extensions/load-shedding/deployment/pom.xml
index f711856cd346b..87bf3876e7215 100644
--- a/extensions/load-shedding/deployment/pom.xml
+++ b/extensions/load-shedding/deployment/pom.xml
@@ -32,7 +32,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/logging-json/deployment/pom.xml b/extensions/logging-json/deployment/pom.xml
index 55f7a5f436c9a..72da6c8610a83 100644
--- a/extensions/logging-json/deployment/pom.xml
+++ b/extensions/logging-json/deployment/pom.xml
@@ -29,12 +29,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/mailer/deployment/pom.xml b/extensions/mailer/deployment/pom.xml
index 5354e2b6fb068..eb408364f60ca 100644
--- a/extensions/mailer/deployment/pom.xml
+++ b/extensions/mailer/deployment/pom.xml
@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/mailer/runtime/pom.xml b/extensions/mailer/runtime/pom.xml
index cd2a87d365d3d..5153c244a108c 100644
--- a/extensions/mailer/runtime/pom.xml
+++ b/extensions/mailer/runtime/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/micrometer-opentelemetry/deployment/pom.xml b/extensions/micrometer-opentelemetry/deployment/pom.xml
index a500f05fa846a..eb7d8fe607900 100644
--- a/extensions/micrometer-opentelemetry/deployment/pom.xml
+++ b/extensions/micrometer-opentelemetry/deployment/pom.xml
@@ -36,13 +36,13 @@
         <!--TESTS-->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/extensions/micrometer/deployment/pom.xml b/extensions/micrometer/deployment/pom.xml
index cf381f90c8470..1115f53525ab8 100644
--- a/extensions/micrometer/deployment/pom.xml
+++ b/extensions/micrometer/deployment/pom.xml
@@ -75,7 +75,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/extensions/mongodb-client/deployment/pom.xml b/extensions/mongodb-client/deployment/pom.xml
index 26793f47ffe19..28dfb193c9986 100644
--- a/extensions/mongodb-client/deployment/pom.xml
+++ b/extensions/mongodb-client/deployment/pom.xml
@@ -78,7 +78,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/mongodb-client/runtime/pom.xml b/extensions/mongodb-client/runtime/pom.xml
index af44d9db8b5f2..49e015fac9f11 100644
--- a/extensions/mongodb-client/runtime/pom.xml
+++ b/extensions/mongodb-client/runtime/pom.xml
@@ -94,7 +94,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/mutiny/deployment/pom.xml b/extensions/mutiny/deployment/pom.xml
index f7b1e6bc665f7..fc5073ed4e061 100644
--- a/extensions/mutiny/deployment/pom.xml
+++ b/extensions/mutiny/deployment/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/mutiny/runtime/pom.xml b/extensions/mutiny/runtime/pom.xml
index d371c3be102ee..11d71ed3e007f 100644
--- a/extensions/mutiny/runtime/pom.xml
+++ b/extensions/mutiny/runtime/pom.xml
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/narayana-jta/deployment/pom.xml b/extensions/narayana-jta/deployment/pom.xml
index 9cb051259de8a..0a70975e9ebd3 100644
--- a/extensions/narayana-jta/deployment/pom.xml
+++ b/extensions/narayana-jta/deployment/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/narayana-jta/runtime/pom.xml b/extensions/narayana-jta/runtime/pom.xml
index 56552a061022d..65fc082554888 100644
--- a/extensions/narayana-jta/runtime/pom.xml
+++ b/extensions/narayana-jta/runtime/pom.xml
@@ -86,12 +86,12 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/narayana-lra/deployment/pom.xml b/extensions/narayana-lra/deployment/pom.xml
index 4091b05335038..f4d2dfe51d5ab 100644
--- a/extensions/narayana-lra/deployment/pom.xml
+++ b/extensions/narayana-lra/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/observability-devservices/deployment/pom.xml b/extensions/observability-devservices/deployment/pom.xml
index 8a64966e0f394..bd9a856a8b85c 100644
--- a/extensions/observability-devservices/deployment/pom.xml
+++ b/extensions/observability-devservices/deployment/pom.xml
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/observability-devservices/runtime/pom.xml b/extensions/observability-devservices/runtime/pom.xml
index 4d6e62ca246cb..adee302efadef 100644
--- a/extensions/observability-devservices/runtime/pom.xml
+++ b/extensions/observability-devservices/runtime/pom.xml
@@ -38,7 +38,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/observability-devservices/testcontainers/pom.xml b/extensions/observability-devservices/testcontainers/pom.xml
index 3fef491129f49..72a51752c79e2 100644
--- a/extensions/observability-devservices/testcontainers/pom.xml
+++ b/extensions/observability-devservices/testcontainers/pom.xml
@@ -35,10 +35,6 @@
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/extensions/observability-devservices/testlibs/devresource-testcontainers/pom.xml b/extensions/observability-devservices/testlibs/devresource-testcontainers/pom.xml
index 1f943c5afaeeb..2907ea483657a 100644
--- a/extensions/observability-devservices/testlibs/devresource-testcontainers/pom.xml
+++ b/extensions/observability-devservices/testlibs/devresource-testcontainers/pom.xml
@@ -31,9 +31,5 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/extensions/oidc-client-filter/deployment/pom.xml b/extensions/oidc-client-filter/deployment/pom.xml
index de9d9280efc7d..81790777e1548 100644
--- a/extensions/oidc-client-filter/deployment/pom.xml
+++ b/extensions/oidc-client-filter/deployment/pom.xml
@@ -28,7 +28,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc-client-filter/runtime/pom.xml b/extensions/oidc-client-filter/runtime/pom.xml
index 5982ff89034e0..8e7a9bf2c4e83 100644
--- a/extensions/oidc-client-filter/runtime/pom.xml
+++ b/extensions/oidc-client-filter/runtime/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/oidc-client-graphql/deployment/pom.xml b/extensions/oidc-client-graphql/deployment/pom.xml
index 3997bd4e39efd..9d5e947846e98 100644
--- a/extensions/oidc-client-graphql/deployment/pom.xml
+++ b/extensions/oidc-client-graphql/deployment/pom.xml
@@ -36,7 +36,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc-client-graphql/runtime/pom.xml b/extensions/oidc-client-graphql/runtime/pom.xml
index 7fda45075d1be..9c036e4e30d29 100644
--- a/extensions/oidc-client-graphql/runtime/pom.xml
+++ b/extensions/oidc-client-graphql/runtime/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/oidc-client-reactive-filter/deployment/pom.xml b/extensions/oidc-client-reactive-filter/deployment/pom.xml
index ab92a8248c4ce..268332fc9ab29 100644
--- a/extensions/oidc-client-reactive-filter/deployment/pom.xml
+++ b/extensions/oidc-client-reactive-filter/deployment/pom.xml
@@ -28,7 +28,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc-client-reactive-filter/runtime/pom.xml b/extensions/oidc-client-reactive-filter/runtime/pom.xml
index 36fab0359d879..c1b93b62e2926 100644
--- a/extensions/oidc-client-reactive-filter/runtime/pom.xml
+++ b/extensions/oidc-client-reactive-filter/runtime/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/oidc-client-registration/deployment/pom.xml b/extensions/oidc-client-registration/deployment/pom.xml
index 3ef0d8dbb10d7..6098df3440625 100644
--- a/extensions/oidc-client-registration/deployment/pom.xml
+++ b/extensions/oidc-client-registration/deployment/pom.xml
@@ -38,7 +38,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/oidc-client-registration/runtime/pom.xml b/extensions/oidc-client-registration/runtime/pom.xml
index 5edc8b2326bc2..6131416c1019c 100644
--- a/extensions/oidc-client-registration/runtime/pom.xml
+++ b/extensions/oidc-client-registration/runtime/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/oidc-client/deployment/pom.xml b/extensions/oidc-client/deployment/pom.xml
index 7e720a5d1db87..a118f593f17a4 100644
--- a/extensions/oidc-client/deployment/pom.xml
+++ b/extensions/oidc-client/deployment/pom.xml
@@ -40,7 +40,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc-client/runtime/pom.xml b/extensions/oidc-client/runtime/pom.xml
index 0091875c7551e..e9ffd70294aed 100644
--- a/extensions/oidc-client/runtime/pom.xml
+++ b/extensions/oidc-client/runtime/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/oidc-common/runtime/pom.xml b/extensions/oidc-common/runtime/pom.xml
index ba59688a9c5b2..2dc6f20513652 100644
--- a/extensions/oidc-common/runtime/pom.xml
+++ b/extensions/oidc-common/runtime/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/oidc-db-token-state-manager/deployment/pom.xml b/extensions/oidc-db-token-state-manager/deployment/pom.xml
index c4ec597917ab4..a0da2e68c8e4b 100644
--- a/extensions/oidc-db-token-state-manager/deployment/pom.xml
+++ b/extensions/oidc-db-token-state-manager/deployment/pom.xml
@@ -34,7 +34,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc-redis-token-state-manager/deployment/pom.xml b/extensions/oidc-redis-token-state-manager/deployment/pom.xml
index 989ee4ea2aa3f..d1f5c47b39acb 100644
--- a/extensions/oidc-redis-token-state-manager/deployment/pom.xml
+++ b/extensions/oidc-redis-token-state-manager/deployment/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc-token-propagation-reactive/deployment/pom.xml b/extensions/oidc-token-propagation-reactive/deployment/pom.xml
index f3d404a1449f5..1bb80e86fafe8 100644
--- a/extensions/oidc-token-propagation-reactive/deployment/pom.xml
+++ b/extensions/oidc-token-propagation-reactive/deployment/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc-token-propagation/deployment/pom.xml b/extensions/oidc-token-propagation/deployment/pom.xml
index b0493801c74d3..02db44b308b29 100644
--- a/extensions/oidc-token-propagation/deployment/pom.xml
+++ b/extensions/oidc-token-propagation/deployment/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc/deployment/pom.xml b/extensions/oidc/deployment/pom.xml
index 71a2fa6d70086..9670061678274 100644
--- a/extensions/oidc/deployment/pom.xml
+++ b/extensions/oidc/deployment/pom.xml
@@ -58,11 +58,6 @@
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-activation</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-devservices-keycloak</artifactId>
@@ -86,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/oidc/runtime/pom.xml b/extensions/oidc/runtime/pom.xml
index 3b91971600968..ef1e0063b1027 100644
--- a/extensions/oidc/runtime/pom.xml
+++ b/extensions/oidc/runtime/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/openshift-client/deployment/pom.xml b/extensions/openshift-client/deployment/pom.xml
index be6e59b1dc0d5..48092643236ad 100644
--- a/extensions/openshift-client/deployment/pom.xml
+++ b/extensions/openshift-client/deployment/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
       <dependency>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-junit5-internal</artifactId>
+        <artifactId>quarkus-junit-internal</artifactId>
         <scope>test</scope>
       </dependency>
     </dependencies>
diff --git a/extensions/opentelemetry/deployment/pom.xml b/extensions/opentelemetry/deployment/pom.xml
index 8c550ceb70b2d..d0a7ed263414e 100644
--- a/extensions/opentelemetry/deployment/pom.xml
+++ b/extensions/opentelemetry/deployment/pom.xml
@@ -61,12 +61,12 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml
index 7eeb04c154e88..d9603d1b8fb1b 100644
--- a/extensions/opentelemetry/runtime/pom.xml
+++ b/extensions/opentelemetry/runtime/pom.xml
@@ -210,7 +210,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/pom.xml b/extensions/panache/hibernate-orm-panache-kotlin/deployment/pom.xml
index d7dc78538de28..e0165b1d33576 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/pom.xml
@@ -50,7 +50,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
index fab0ef27078b0..9e77297898f3c 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
@@ -50,7 +50,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/hibernate-orm-panache/deployment/pom.xml b/extensions/panache/hibernate-orm-panache/deployment/pom.xml
index 12d5d41e6364b..97c58369aeb1d 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/pom.xml
+++ b/extensions/panache/hibernate-orm-panache/deployment/pom.xml
@@ -40,7 +40,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml b/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
index 7bbde890e8b4f..5b8e1d578a5b7 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/pom.xml
index e176434f2b5c1..1a4b295b49168 100644
--- a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/pom.xml
+++ b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/pom.xml
@@ -36,7 +36,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml
index ea051e1cfbb21..35403e3424b68 100644
--- a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml
+++ b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml
@@ -32,7 +32,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/pom.xml b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/pom.xml
index 8729e38d866f8..014589b919820 100644
--- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/pom.xml
+++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/mongodb-panache-common/deployment/pom.xml b/extensions/panache/mongodb-panache-common/deployment/pom.xml
index b1fbfef414f3d..4097582f650f5 100644
--- a/extensions/panache/mongodb-panache-common/deployment/pom.xml
+++ b/extensions/panache/mongodb-panache-common/deployment/pom.xml
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/pom.xml b/extensions/panache/mongodb-panache-kotlin/deployment/pom.xml
index ddd0ed62537a7..f07d84ee410da 100644
--- a/extensions/panache/mongodb-panache-kotlin/deployment/pom.xml
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/pom.xml
@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/panache/mongodb-panache/deployment/pom.xml b/extensions/panache/mongodb-panache/deployment/pom.xml
index a51cd8bd288a1..8148cfdf37f07 100644
--- a/extensions/panache/mongodb-panache/deployment/pom.xml
+++ b/extensions/panache/mongodb-panache/deployment/pom.xml
@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/panache/panache-mock/pom.xml b/extensions/panache/panache-mock/pom.xml
index 88cf808f18383..4fbe1ceb667b6 100644
--- a/extensions/panache/panache-mock/pom.xml
+++ b/extensions/panache/panache-mock/pom.xml
@@ -28,11 +28,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-component</artifactId>
+            <artifactId>quarkus-junit-component</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/extensions/panache/rest-data-panache/deployment/pom.xml b/extensions/panache/rest-data-panache/deployment/pom.xml
index fdaa530f6713c..fb605388946df 100644
--- a/extensions/panache/rest-data-panache/deployment/pom.xml
+++ b/extensions/panache/rest-data-panache/deployment/pom.xml
@@ -42,7 +42,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/picocli/deployment/pom.xml b/extensions/picocli/deployment/pom.xml
index 96983bfd2116b..1c6786681c8cb 100644
--- a/extensions/picocli/deployment/pom.xml
+++ b/extensions/picocli/deployment/pom.xml
@@ -29,12 +29,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/proxy-registry/deployment/pom.xml b/extensions/proxy-registry/deployment/pom.xml
index 79899611397bc..18aafff766f98 100644
--- a/extensions/proxy-registry/deployment/pom.xml
+++ b/extensions/proxy-registry/deployment/pom.xml
@@ -32,7 +32,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/quartz/deployment/pom.xml b/extensions/quartz/deployment/pom.xml
index 3c3294bb7144a..ee7df8da36dc5 100644
--- a/extensions/quartz/deployment/pom.xml
+++ b/extensions/quartz/deployment/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/qute/deployment/pom.xml b/extensions/qute/deployment/pom.xml
index bb8d8d92415bc..02332947f1e96 100644
--- a/extensions/qute/deployment/pom.xml
+++ b/extensions/qute/deployment/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/reactive-datasource/deployment/pom.xml b/extensions/reactive-datasource/deployment/pom.xml
index 87637875c5e39..bd6257ab6f8bf 100644
--- a/extensions/reactive-datasource/deployment/pom.xml
+++ b/extensions/reactive-datasource/deployment/pom.xml
@@ -33,7 +33,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/reactive-mssql-client/deployment/pom.xml b/extensions/reactive-mssql-client/deployment/pom.xml
index 6e3f8a3309452..01b7f4bdb5c91 100644
--- a/extensions/reactive-mssql-client/deployment/pom.xml
+++ b/extensions/reactive-mssql-client/deployment/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/reactive-mysql-client/deployment/pom.xml b/extensions/reactive-mysql-client/deployment/pom.xml
index 3128ae1428d46..7453a2a5221c5 100644
--- a/extensions/reactive-mysql-client/deployment/pom.xml
+++ b/extensions/reactive-mysql-client/deployment/pom.xml
@@ -77,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/reactive-oracle-client/deployment/pom.xml b/extensions/reactive-oracle-client/deployment/pom.xml
index 08c2762326a94..d5adffd108a57 100644
--- a/extensions/reactive-oracle-client/deployment/pom.xml
+++ b/extensions/reactive-oracle-client/deployment/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/reactive-pg-client/deployment/pom.xml b/extensions/reactive-pg-client/deployment/pom.xml
index 526a5676f6b9a..b0181a4959f7c 100644
--- a/extensions/reactive-pg-client/deployment/pom.xml
+++ b/extensions/reactive-pg-client/deployment/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/reactive-routes/deployment/pom.xml b/extensions/reactive-routes/deployment/pom.xml
index 003067462d7fa..2c66c93a918ec 100644
--- a/extensions/reactive-routes/deployment/pom.xml
+++ b/extensions/reactive-routes/deployment/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/pom.xml b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/pom.xml
index f05efcb0909f9..19cec0b2c5872 100644
--- a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/pom.xml
+++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/pom.xml
index 2fc5c3ed4d5c9..8674a4bd9ea4a 100644
--- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/pom.xml
+++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/redis-cache/deployment/pom.xml b/extensions/redis-cache/deployment/pom.xml
index 4fa7d52ac6ef9..1a989a4ad6bca 100644
--- a/extensions/redis-cache/deployment/pom.xml
+++ b/extensions/redis-cache/deployment/pom.xml
@@ -40,11 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/redis-cache/runtime/pom.xml b/extensions/redis-cache/runtime/pom.xml
index a0595a1e12263..a4a83055c91d5 100644
--- a/extensions/redis-cache/runtime/pom.xml
+++ b/extensions/redis-cache/runtime/pom.xml
@@ -39,11 +39,6 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
diff --git a/extensions/redis-client/deployment/pom.xml b/extensions/redis-client/deployment/pom.xml
index 5a4d01013c823..4756028634e4d 100644
--- a/extensions/redis-client/deployment/pom.xml
+++ b/extensions/redis-client/deployment/pom.xml
@@ -55,11 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/redis-client/runtime/pom.xml b/extensions/redis-client/runtime/pom.xml
index 8cf367bd61db1..8f1a2d07e77ae 100644
--- a/extensions/redis-client/runtime/pom.xml
+++ b/extensions/redis-client/runtime/pom.xml
@@ -67,11 +67,6 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
diff --git a/extensions/resteasy-classic/rest-client-config/deployment/pom.xml b/extensions/resteasy-classic/rest-client-config/deployment/pom.xml
index 6e393f01fa3ba..c8a78446ddf63 100644
--- a/extensions/resteasy-classic/rest-client-config/deployment/pom.xml
+++ b/extensions/resteasy-classic/rest-client-config/deployment/pom.xml
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/rest-client-config/runtime/pom.xml b/extensions/resteasy-classic/rest-client-config/runtime/pom.xml
index 295009715b204..52b879f1f252a 100644
--- a/extensions/resteasy-classic/rest-client-config/runtime/pom.xml
+++ b/extensions/resteasy-classic/rest-client-config/runtime/pom.xml
@@ -39,7 +39,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-client-jackson/deployment/pom.xml b/extensions/resteasy-classic/resteasy-client-jackson/deployment/pom.xml
index 0dc5d4b990eeb..5fc8e8cac3692 100644
--- a/extensions/resteasy-classic/resteasy-client-jackson/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-client-jackson/deployment/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-client-jaxb/deployment/pom.xml b/extensions/resteasy-classic/resteasy-client-jaxb/deployment/pom.xml
index 4f8ed3f46460c..974173053d4ba 100644
--- a/extensions/resteasy-classic/resteasy-client-jaxb/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-client-jaxb/deployment/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-client-jsonb/deployment/pom.xml b/extensions/resteasy-classic/resteasy-client-jsonb/deployment/pom.xml
index b68a8f792c06d..78fae77727a4d 100644
--- a/extensions/resteasy-classic/resteasy-client-jsonb/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-client-jsonb/deployment/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-client-mutiny/deployment/pom.xml b/extensions/resteasy-classic/resteasy-client-mutiny/deployment/pom.xml
index abe9a2689494f..0be46aef6c180 100644
--- a/extensions/resteasy-classic/resteasy-client-mutiny/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-client-mutiny/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-client/deployment/pom.xml b/extensions/resteasy-classic/resteasy-client/deployment/pom.xml
index 0bcfdf8e974c2..9988e1f3b3265 100644
--- a/extensions/resteasy-classic/resteasy-client/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-client/deployment/pom.xml
@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-client/runtime/pom.xml b/extensions/resteasy-classic/resteasy-client/runtime/pom.xml
index 84ee6486e0ff4..6681446004099 100644
--- a/extensions/resteasy-classic/resteasy-client/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-client/runtime/pom.xml
@@ -93,7 +93,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/pom.xml b/extensions/resteasy-classic/resteasy-jackson/deployment/pom.xml
index 1fae47a05b8bc..2b52343e550fb 100644
--- a/extensions/resteasy-classic/resteasy-jackson/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-jackson/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/pom.xml b/extensions/resteasy-classic/resteasy-jaxb/deployment/pom.xml
index f864cc70724e9..f81d68a653f12 100644
--- a/extensions/resteasy-classic/resteasy-jaxb/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-jaxb/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-jsonb/deployment/pom.xml b/extensions/resteasy-classic/resteasy-jsonb/deployment/pom.xml
index 83e9c7b7f19e8..296a75eacda8c 100644
--- a/extensions/resteasy-classic/resteasy-jsonb/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-jsonb/deployment/pom.xml
@@ -28,7 +28,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-links/deployment/pom.xml b/extensions/resteasy-classic/resteasy-links/deployment/pom.xml
index 00afc00a858e4..29c585338b3da 100644
--- a/extensions/resteasy-classic/resteasy-links/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-links/deployment/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-multipart/deployment/pom.xml b/extensions/resteasy-classic/resteasy-multipart/deployment/pom.xml
index d20e6b79e3f73..77344adac6187 100644
--- a/extensions/resteasy-classic/resteasy-multipart/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-multipart/deployment/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml
index f6ee5b8533d3e..e7d35ba94f406 100644
--- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-mutiny/deployment/pom.xml b/extensions/resteasy-classic/resteasy-mutiny/deployment/pom.xml
index e55775ab0e8f3..e37850b539020 100644
--- a/extensions/resteasy-classic/resteasy-mutiny/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-mutiny/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-mutiny/runtime/pom.xml b/extensions/resteasy-classic/resteasy-mutiny/runtime/pom.xml
index 2d24d5e790bad..2b351269f7eb4 100644
--- a/extensions/resteasy-classic/resteasy-mutiny/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-mutiny/runtime/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/pom.xml b/extensions/resteasy-classic/resteasy-qute/deployment/pom.xml
index c1dae2af893df..e7fa4f41226e7 100644
--- a/extensions/resteasy-classic/resteasy-qute/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-qute/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-classic/resteasy/deployment/pom.xml b/extensions/resteasy-classic/resteasy/deployment/pom.xml
index 1add9051885e5..307deb453bf6d 100644
--- a/extensions/resteasy-classic/resteasy/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy/deployment/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-client-jackson/deployment/pom.xml b/extensions/resteasy-reactive/rest-client-jackson/deployment/pom.xml
index e5d0ef7b25330..6ee44c1b4201f 100644
--- a/extensions/resteasy-reactive/rest-client-jackson/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-client-jackson/deployment/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-client-jaxb/deployment/pom.xml b/extensions/resteasy-reactive/rest-client-jaxb/deployment/pom.xml
index 11e8c3e95f621..7a383bff47717 100644
--- a/extensions/resteasy-reactive/rest-client-jaxb/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-client-jaxb/deployment/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml b/extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml
index bc8a8c616760a..74c2fe8c3b733 100644
--- a/extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-client-jaxrs/deployment/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-client-jsonb/deployment/pom.xml b/extensions/resteasy-reactive/rest-client-jsonb/deployment/pom.xml
index 8e7d33b9c15ff..e2eab10ea6356 100644
--- a/extensions/resteasy-reactive/rest-client-jsonb/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-client-jsonb/deployment/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-client-kotlin-serialization/deployment/pom.xml b/extensions/resteasy-reactive/rest-client-kotlin-serialization/deployment/pom.xml
index b4ea4767243ba..ba2ccb17bd4c8 100644
--- a/extensions/resteasy-reactive/rest-client-kotlin-serialization/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-client-kotlin-serialization/deployment/pom.xml
@@ -39,7 +39,7 @@
         <!-- test dependencies: -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/pom.xml b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/pom.xml
index a9c25a0476e58..6c8a36f8087b1 100644
--- a/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/pom.xml
+++ b/extensions/resteasy-reactive/rest-client-kotlin-serialization/tests/pom.xml
@@ -39,7 +39,7 @@
         <!-- test dependencies: -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-client/deployment/pom.xml b/extensions/resteasy-reactive/rest-client/deployment/pom.xml
index 54703574421db..4d41d5f647d10 100644
--- a/extensions/resteasy-reactive/rest-client/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-client/deployment/pom.xml
@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-client/runtime/pom.xml b/extensions/resteasy-reactive/rest-client/runtime/pom.xml
index 744bcbb6d0f0c..9e5639e6874f9 100644
--- a/extensions/resteasy-reactive/rest-client/runtime/pom.xml
+++ b/extensions/resteasy-reactive/rest-client/runtime/pom.xml
@@ -44,12 +44,12 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-csrf/deployment/pom.xml b/extensions/resteasy-reactive/rest-csrf/deployment/pom.xml
index 963702bc639df..8b9668adb0126 100644
--- a/extensions/resteasy-reactive/rest-csrf/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-csrf/deployment/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-jackson/deployment/pom.xml b/extensions/resteasy-reactive/rest-jackson/deployment/pom.xml
index 575644d4586c1..6bc125288076d 100644
--- a/extensions/resteasy-reactive/rest-jackson/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-jackson/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-jaxb/deployment/pom.xml b/extensions/resteasy-reactive/rest-jaxb/deployment/pom.xml
index 280bf9d77ba5d..be77d6bcad1ef 100644
--- a/extensions/resteasy-reactive/rest-jaxb/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-jaxb/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-jsonb/deployment/pom.xml b/extensions/resteasy-reactive/rest-jsonb/deployment/pom.xml
index eccc4d245c7fd..4b05bc8ed4cc2 100644
--- a/extensions/resteasy-reactive/rest-jsonb/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-jsonb/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/pom.xml b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/pom.xml
index 34164d680d281..90065c2601138 100644
--- a/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-kotlin-serialization-common/deployment/pom.xml
@@ -29,7 +29,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/resteasy-reactive/rest-kotlin-serialization-common/runtime/pom.xml b/extensions/resteasy-reactive/rest-kotlin-serialization-common/runtime/pom.xml
index ee8e4d0d1d51c..1a6d7c4f46fbb 100644
--- a/extensions/resteasy-reactive/rest-kotlin-serialization-common/runtime/pom.xml
+++ b/extensions/resteasy-reactive/rest-kotlin-serialization-common/runtime/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/resteasy-reactive/rest-links/deployment/pom.xml b/extensions/resteasy-reactive/rest-links/deployment/pom.xml
index dd6d21d16c505..7c60ca0fe1f13 100644
--- a/extensions/resteasy-reactive/rest-links/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-links/deployment/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-qute/deployment/pom.xml b/extensions/resteasy-reactive/rest-qute/deployment/pom.xml
index b624cc0e9721a..0ef0e82d8c11e 100644
--- a/extensions/resteasy-reactive/rest-qute/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-qute/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest-servlet/deployment/pom.xml b/extensions/resteasy-reactive/rest-servlet/deployment/pom.xml
index ba556e043dd2c..4082c527583df 100644
--- a/extensions/resteasy-reactive/rest-servlet/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest-servlet/deployment/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy-reactive/rest/deployment/pom.xml b/extensions/resteasy-reactive/rest/deployment/pom.xml
index baa5aeb76019a..ac53cc1873b44 100644
--- a/extensions/resteasy-reactive/rest/deployment/pom.xml
+++ b/extensions/resteasy-reactive/rest/deployment/pom.xml
@@ -73,7 +73,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/scheduler/deployment/pom.xml b/extensions/scheduler/deployment/pom.xml
index 7fec966c6e2e4..f468fc301c51f 100644
--- a/extensions/scheduler/deployment/pom.xml
+++ b/extensions/scheduler/deployment/pom.xml
@@ -55,7 +55,7 @@
       </dependency>
       <dependency>
           <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-junit5-internal</artifactId>
+          <artifactId>quarkus-junit-internal</artifactId>
           <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/extensions/security-jpa-reactive/deployment/pom.xml b/extensions/security-jpa-reactive/deployment/pom.xml
index e681917b9dfde..893d1f716c69c 100644
--- a/extensions/security-jpa-reactive/deployment/pom.xml
+++ b/extensions/security-jpa-reactive/deployment/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/security-jpa/deployment/pom.xml b/extensions/security-jpa/deployment/pom.xml
index 2ac51103932ee..809a4d09c8721 100644
--- a/extensions/security-jpa/deployment/pom.xml
+++ b/extensions/security-jpa/deployment/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/security-webauthn/deployment/pom.xml b/extensions/security-webauthn/deployment/pom.xml
index bf0f0d74fe732..1eab68d4370f0 100644
--- a/extensions/security-webauthn/deployment/pom.xml
+++ b/extensions/security-webauthn/deployment/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/security/deployment/pom.xml b/extensions/security/deployment/pom.xml
index 14a37927038ef..eb3ceee60ba40 100644
--- a/extensions/security/deployment/pom.xml
+++ b/extensions/security/deployment/pom.xml
@@ -32,7 +32,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/security/runtime/pom.xml b/extensions/security/runtime/pom.xml
index d05dd5738fb53..bea775c665841 100644
--- a/extensions/security/runtime/pom.xml
+++ b/extensions/security/runtime/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/security/test-utils/pom.xml b/extensions/security/test-utils/pom.xml
index 01f287aaa3857..9422e83e36335 100644
--- a/extensions/security/test-utils/pom.xml
+++ b/extensions/security/test-utils/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
diff --git a/extensions/smallrye-context-propagation/deployment/pom.xml b/extensions/smallrye-context-propagation/deployment/pom.xml
index b7619fc0a23a4..d9147a152978f 100644
--- a/extensions/smallrye-context-propagation/deployment/pom.xml
+++ b/extensions/smallrye-context-propagation/deployment/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/smallrye-fault-tolerance/deployment/pom.xml b/extensions/smallrye-fault-tolerance/deployment/pom.xml
index f4ba52163f477..b56632550dd36 100644
--- a/extensions/smallrye-fault-tolerance/deployment/pom.xml
+++ b/extensions/smallrye-fault-tolerance/deployment/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-graphql-client/deployment/pom.xml b/extensions/smallrye-graphql-client/deployment/pom.xml
index bc4ea4bcff34e..35252c5f30c62 100644
--- a/extensions/smallrye-graphql-client/deployment/pom.xml
+++ b/extensions/smallrye-graphql-client/deployment/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-graphql/deployment/pom.xml b/extensions/smallrye-graphql/deployment/pom.xml
index 73bb3794b3b21..c574dfc8e3480 100644
--- a/extensions/smallrye-graphql/deployment/pom.xml
+++ b/extensions/smallrye-graphql/deployment/pom.xml
@@ -64,7 +64,7 @@
         <!--  Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-health/deployment/pom.xml b/extensions/smallrye-health/deployment/pom.xml
index 97ba964a1f1b7..2c99fa38d83a8 100644
--- a/extensions/smallrye-health/deployment/pom.xml
+++ b/extensions/smallrye-health/deployment/pom.xml
@@ -52,7 +52,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-jwt-build/deployment/pom.xml b/extensions/smallrye-jwt-build/deployment/pom.xml
index 2b3f73e683d10..298d6f7b1af6f 100644
--- a/extensions/smallrye-jwt-build/deployment/pom.xml
+++ b/extensions/smallrye-jwt-build/deployment/pom.xml
@@ -33,7 +33,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/smallrye-jwt/deployment/pom.xml b/extensions/smallrye-jwt/deployment/pom.xml
index 5ccd553fa3e22..0bdce7545f43a 100644
--- a/extensions/smallrye-jwt/deployment/pom.xml
+++ b/extensions/smallrye-jwt/deployment/pom.xml
@@ -42,7 +42,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-metrics/deployment/pom.xml b/extensions/smallrye-metrics/deployment/pom.xml
index 0d2b2e8cae815..f7ac8bae937fc 100644
--- a/extensions/smallrye-metrics/deployment/pom.xml
+++ b/extensions/smallrye-metrics/deployment/pom.xml
@@ -58,7 +58,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-openapi/deployment/pom.xml b/extensions/smallrye-openapi/deployment/pom.xml
index 2b978f5be6494..2e2226614ed9d 100644
--- a/extensions/smallrye-openapi/deployment/pom.xml
+++ b/extensions/smallrye-openapi/deployment/pom.xml
@@ -93,7 +93,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml b/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml
index e6e2971530140..bf5105a9ea904 100644
--- a/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml
+++ b/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -62,10 +62,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>artemis-amqp-protocol</artifactId>
diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml
index 0cdeb34d17a97..4b64c992874bb 100644
--- a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml
+++ b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml
@@ -59,7 +59,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -74,7 +74,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-reactive-messaging-mqtt/deployment/pom.xml b/extensions/smallrye-reactive-messaging-mqtt/deployment/pom.xml
index af47df29cf77c..49298b916b538 100644
--- a/extensions/smallrye-reactive-messaging-mqtt/deployment/pom.xml
+++ b/extensions/smallrye-reactive-messaging-mqtt/deployment/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/smallrye-reactive-messaging-pulsar/deployment/pom.xml b/extensions/smallrye-reactive-messaging-pulsar/deployment/pom.xml
index 76404947dcf57..c41a384ea0879 100644
--- a/extensions/smallrye-reactive-messaging-pulsar/deployment/pom.xml
+++ b/extensions/smallrye-reactive-messaging-pulsar/deployment/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -65,10 +65,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit4-mock</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-deployment</artifactId>
diff --git a/extensions/smallrye-reactive-messaging-pulsar/runtime/pom.xml b/extensions/smallrye-reactive-messaging-pulsar/runtime/pom.xml
index d34381809feb6..8dc89251286d9 100644
--- a/extensions/smallrye-reactive-messaging-pulsar/runtime/pom.xml
+++ b/extensions/smallrye-reactive-messaging-pulsar/runtime/pom.xml
@@ -128,7 +128,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-reactive-messaging/deployment/pom.xml b/extensions/smallrye-reactive-messaging/deployment/pom.xml
index 35087ac197738..b60952d1c722e 100644
--- a/extensions/smallrye-reactive-messaging/deployment/pom.xml
+++ b/extensions/smallrye-reactive-messaging/deployment/pom.xml
@@ -68,7 +68,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-cache/deployment/pom.xml b/extensions/spring-cache/deployment/pom.xml
index 3651930e3ed81..a806f22560e79 100644
--- a/extensions/spring-cache/deployment/pom.xml
+++ b/extensions/spring-cache/deployment/pom.xml
@@ -24,7 +24,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/spring-cloud-config-client/runtime/pom.xml b/extensions/spring-cloud-config-client/runtime/pom.xml
index 3ce10e3d3c56f..d8940b7a421cd 100644
--- a/extensions/spring-cloud-config-client/runtime/pom.xml
+++ b/extensions/spring-cloud-config-client/runtime/pom.xml
@@ -42,7 +42,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-data-jpa/deployment/pom.xml b/extensions/spring-data-jpa/deployment/pom.xml
index a37901e4d8e67..0ffdba6e8437c 100644
--- a/extensions/spring-data-jpa/deployment/pom.xml
+++ b/extensions/spring-data-jpa/deployment/pom.xml
@@ -29,7 +29,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-data-rest/deployment/pom.xml b/extensions/spring-data-rest/deployment/pom.xml
index aad013b6304fd..14d4f65a0f453 100644
--- a/extensions/spring-data-rest/deployment/pom.xml
+++ b/extensions/spring-data-rest/deployment/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-di/deployment/pom.xml b/extensions/spring-di/deployment/pom.xml
index 1c205a5a8a753..8f7c47c7ebab2 100644
--- a/extensions/spring-di/deployment/pom.xml
+++ b/extensions/spring-di/deployment/pom.xml
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-scheduled/deployment/pom.xml b/extensions/spring-scheduled/deployment/pom.xml
index f723a49e98c87..fa19a88cb39c7 100644
--- a/extensions/spring-scheduled/deployment/pom.xml
+++ b/extensions/spring-scheduled/deployment/pom.xml
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-security/deployment/pom.xml b/extensions/spring-security/deployment/pom.xml
index 883f98a0ffe09..c68d37b39decd 100644
--- a/extensions/spring-security/deployment/pom.xml
+++ b/extensions/spring-security/deployment/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-web/resteasy-classic/tests/pom.xml b/extensions/spring-web/resteasy-classic/tests/pom.xml
index 6388acc7d5c13..ce9050bbcf1f5 100644
--- a/extensions/spring-web/resteasy-classic/tests/pom.xml
+++ b/extensions/spring-web/resteasy-classic/tests/pom.xml
@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-web/resteasy-reactive/deployment/pom.xml b/extensions/spring-web/resteasy-reactive/deployment/pom.xml
index 4d4df3ebf8e21..09145689cee07 100644
--- a/extensions/spring-web/resteasy-reactive/deployment/pom.xml
+++ b/extensions/spring-web/resteasy-reactive/deployment/pom.xml
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/spring-web/resteasy-reactive/tests/pom.xml b/extensions/spring-web/resteasy-reactive/tests/pom.xml
index ae2f087e56e6d..237ac2aee707c 100644
--- a/extensions/spring-web/resteasy-reactive/tests/pom.xml
+++ b/extensions/spring-web/resteasy-reactive/tests/pom.xml
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/swagger-ui/deployment/pom.xml b/extensions/swagger-ui/deployment/pom.xml
index ccf9d505b2c7e..ca3b098278fca 100644
--- a/extensions/swagger-ui/deployment/pom.xml
+++ b/extensions/swagger-ui/deployment/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/tls-registry/deployment/pom.xml b/extensions/tls-registry/deployment/pom.xml
index 35fd92664cad5..f1ae5a761221e 100644
--- a/extensions/tls-registry/deployment/pom.xml
+++ b/extensions/tls-registry/deployment/pom.xml
@@ -44,12 +44,12 @@
         <!-- Tests -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/undertow/deployment/pom.xml b/extensions/undertow/deployment/pom.xml
index 1c7a5c575b87c..8bcffda729f10 100644
--- a/extensions/undertow/deployment/pom.xml
+++ b/extensions/undertow/deployment/pom.xml
@@ -59,7 +59,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/vertx-graphql/deployment/pom.xml b/extensions/vertx-graphql/deployment/pom.xml
index be1a3e162d3c5..bc3fc4c136b4c 100644
--- a/extensions/vertx-graphql/deployment/pom.xml
+++ b/extensions/vertx-graphql/deployment/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml
index a83c13c900268..74e2581369067 100644
--- a/extensions/vertx-http/deployment/pom.xml
+++ b/extensions/vertx-http/deployment/pom.xml
@@ -72,12 +72,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/vertx/deployment/pom.xml b/extensions/vertx/deployment/pom.xml
index 2a20d69ccaa36..b4fe531c3fe28 100644
--- a/extensions/vertx/deployment/pom.xml
+++ b/extensions/vertx/deployment/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/virtual-threads/runtime/pom.xml b/extensions/virtual-threads/runtime/pom.xml
index 693d72542e6b9..70761348c217f 100644
--- a/extensions/virtual-threads/runtime/pom.xml
+++ b/extensions/virtual-threads/runtime/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/web-dependency-locator/deployment/pom.xml b/extensions/web-dependency-locator/deployment/pom.xml
index 1bc3ce715940f..db678a9fd9389 100644
--- a/extensions/web-dependency-locator/deployment/pom.xml
+++ b/extensions/web-dependency-locator/deployment/pom.xml
@@ -45,7 +45,7 @@
         <!-- Tests -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/websockets-next/deployment/pom.xml b/extensions/websockets-next/deployment/pom.xml
index 27678964c0895..770fb2ffc44d9 100644
--- a/extensions/websockets-next/deployment/pom.xml
+++ b/extensions/websockets-next/deployment/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/websockets/client/deployment/pom.xml b/extensions/websockets/client/deployment/pom.xml
index 9b61a1c37c51c..b9c1059a142ec 100644
--- a/extensions/websockets/client/deployment/pom.xml
+++ b/extensions/websockets/client/deployment/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/websockets/server/deployment/pom.xml b/extensions/websockets/server/deployment/pom.xml
index b4eea0ff7c9aa..be676599649e8 100644
--- a/extensions/websockets/server/deployment/pom.xml
+++ b/extensions/websockets/server/deployment/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
index f5ee35e0fb287..2370313e66db6 100644
--- a/independent-projects/arc/pom.xml
+++ b/independent-projects/arc/pom.xml
@@ -53,7 +53,7 @@
         <version.smallrye-common>2.14.0</version.smallrye-common>
         <!-- test versions -->
         <version.assertj>3.27.6</version.assertj>
-        <version.junit5>5.13.4</version.junit5>
+        <version.junit>6.0.1</version.junit>
         <version.kotlin>2.2.21</version.kotlin>
         <version.kotlin-coroutines>1.10.2</version.kotlin-coroutines>
         <version.mockito>5.21.0</version.mockito>
@@ -163,11 +163,11 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- JUnit 5 dependencies, imported as a BOM -->
+            <!-- JUnit dependencies, imported as a BOM -->
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>${version.junit5}</version>
+                <version>${version.junit}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/independent-projects/bootstrap/bom-test/pom.xml b/independent-projects/bootstrap/bom-test/pom.xml
index 89daac3cff591..09a1984ba83a6 100644
--- a/independent-projects/bootstrap/bom-test/pom.xml
+++ b/independent-projects/bootstrap/bom-test/pom.xml
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>${junit5.version}</version>
+                <version>${junit.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/modules-in-profiles/integration-tests/rest-tests/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/modules-in-profiles/integration-tests/rest-tests/pom.xml
index c76dc44ac166c..22674c462616b 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/modules-in-profiles/integration-tests/rest-tests/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/modules-in-profiles/integration-tests/rest-tests/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index c06890bf22cb2..429b7e9f51c25 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -40,7 +40,7 @@
         <assertj.version>3.27.6</assertj.version>
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.6.1.Final</jboss-logging.version>
-        <junit5.version>5.13.4</junit5.version>
+        <junit.version>6.0.1</junit.version>
         <maven-core.version>3.9.11</maven-core.version><!-- Keep in sync with sisu.version -->
         <sisu.version>0.9.0.M4</sisu.version><!-- Keep in sync with maven-core.version -->
         <maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
diff --git a/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies-test.xml b/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies-test.xml
index 4ee8f7c5d3c59..845b13b9614bb 100644
--- a/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies-test.xml
+++ b/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies-test.xml
@@ -23,7 +23,7 @@
             <includes>
                 <include>org.junit.jupiter:*:*:*:test</include>
             </includes>
-            <message>Found JUnit 5 dependencies with wrong scope:</message>
+            <message>Found JUnit dependencies with wrong scope:</message>
         </bannedDependencies>
     </rules>
 </enforcer>
\ No newline at end of file
diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml
index e0c27a5963671..678a2cc80dfe1 100644
--- a/independent-projects/extension-maven-plugin/pom.xml
+++ b/independent-projects/extension-maven-plugin/pom.xml
@@ -39,7 +39,7 @@
         <maven-core.version>3.9.11</maven-core.version>
         <jackson-bom.version>2.20.1</jackson-bom.version>
         <smallrye-beanbag.version>1.5.3</smallrye-beanbag.version>
-        <junit5.version>5.13.4</junit5.version>
+        <junit.version>6.0.1</junit.version>
         <mockito.version>5.21.0</mockito.version>
     </properties>
     <build>
@@ -231,11 +231,11 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- JUnit 5 dependencies, imported as a BOM -->
+            <!-- JUnit dependencies, imported as a BOM -->
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>${junit5.version}</version>
+                <version>${junit.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/independent-projects/junit5-virtual-threads/pom.xml b/independent-projects/junit-virtual-threads/pom.xml
similarity index 96%
rename from independent-projects/junit5-virtual-threads/pom.xml
rename to independent-projects/junit-virtual-threads/pom.xml
index cc8c0d5129af9..b9ec558d6f668 100644
--- a/independent-projects/junit5-virtual-threads/pom.xml
+++ b/independent-projects/junit-virtual-threads/pom.xml
@@ -11,10 +11,10 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <groupId>io.quarkus.junit5</groupId>
-    <artifactId>junit5-virtual-threads</artifactId>
+    <groupId>io.quarkus.junit</groupId>
+    <artifactId>junit-virtual-threads</artifactId>
 
-    <name>Quarkus - JUnit 5 Extension - Virtual Threads</name>
+    <name>Quarkus - JUnit Extension - Virtual Threads</name>
     <description>Module that allows detecting virtual threads pinning</description>
     <url>https://github.com/quarkusio/quarkus</url>
 
@@ -44,7 +44,7 @@
         <jandex.version>3.5.3</jandex.version>
         <smallrye-common.version>2.14.0</smallrye-common.version>
 
-        <junit5.version>5.13.4</junit5.version>
+        <junit.version>6.0.1</junit.version>
         <assertj.version>3.27.6</assertj.version>
     </properties>
 
@@ -58,11 +58,11 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- JUnit 5 dependencies, imported as a BOM -->
+            <!-- JUnit dependencies, imported as a BOM -->
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>${junit5.version}</version>
+                <version>${junit.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -162,7 +162,7 @@
                         <argLine>-Djava.io.tmpdir="${project.build.directory}"</argLine>
                         <excludedEnvironmentVariables>MAVEN_OPTS</excludedEnvironmentVariables>
                         <excludes>
-                            <exclude>io.quarkus.test.junit5.virtual.internal.ignore.**Test.java</exclude>
+                            <exclude>io.quarkus.test.junit.virtual.internal.ignore.**Test.java</exclude>
                         </excludes>
                     </configuration>
                 </plugin>
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldNotPin.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ShouldNotPin.java
similarity index 94%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldNotPin.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ShouldNotPin.java
index eb2f3a2596b80..b7d4d0523593f 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldNotPin.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ShouldNotPin.java
@@ -1,4 +1,4 @@
-package io.quarkus.test.junit5.virtual;
+package io.quarkus.test.junit.virtual;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldPin.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ShouldPin.java
similarity index 94%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldPin.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ShouldPin.java
index 84b2800fb95f3..a70954e8c191f 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldPin.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ShouldPin.java
@@ -1,4 +1,4 @@
-package io.quarkus.test.junit5.virtual;
+package io.quarkus.test.junit.virtual;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ThreadPinnedEvents.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ThreadPinnedEvents.java
new file mode 100644
index 0000000000000..7bccfefa0e685
--- /dev/null
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/ThreadPinnedEvents.java
@@ -0,0 +1,17 @@
+package io.quarkus.test.junit.virtual;
+
+import java.util.List;
+
+import jdk.jfr.consumer.RecordedEvent;
+
+/**
+ * Object that can be injected in a test method.
+ * It gives controlled on the captured events, and so let you do manual checks.
+ * <p>
+ * The returned list is a copy of the list of captured events.
+ */
+public interface ThreadPinnedEvents extends io.quarkus.test.junit5.virtual.ThreadPinnedEvents {
+
+    List<RecordedEvent> getEvents();
+
+}
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/VirtualThreadUnit.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/VirtualThreadUnit.java
similarity index 92%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/VirtualThreadUnit.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/VirtualThreadUnit.java
index 4af392208fdb4..8b246d010d0af 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/VirtualThreadUnit.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/VirtualThreadUnit.java
@@ -1,4 +1,4 @@
-package io.quarkus.test.junit5.virtual;
+package io.quarkus.test.junit.virtual;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,7 +7,7 @@
 
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.quarkus.test.junit5.virtual.internal.VirtualThreadExtension;
+import io.quarkus.test.junit.virtual.internal.VirtualThreadExtension;
 
 /**
  * Extends the test case to detect pinned carrier thread.
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/Collector.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/Collector.java
similarity index 92%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/Collector.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/Collector.java
index 381e610d05627..2e6184119357e 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/Collector.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/Collector.java
@@ -1,4 +1,4 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
 import java.util.List;
 import java.util.function.Consumer;
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/InternalEvents.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/InternalEvents.java
similarity index 70%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/InternalEvents.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/InternalEvents.java
index 1128e67ae5ed1..8a3c1b16aacc6 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/InternalEvents.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/InternalEvents.java
@@ -1,4 +1,4 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
 import jdk.jfr.Category;
 import jdk.jfr.Event;
@@ -11,11 +11,11 @@
  */
 public interface InternalEvents {
 
-    String INITIALIZATION_EVENT_NAME = "io.quarkus.test.junit5.virtual.internal.InternalEvents.InitializationEvent";
-    String SHUTDOWN_EVENT_NAME = "io.quarkus.test.junit5.virtual.internal.InternalEvents.ShutdownEvent";
+    String INITIALIZATION_EVENT_NAME = "internal.io.quarkus.test.junit.virtual.InternalEvents.InitializationEvent";
+    String SHUTDOWN_EVENT_NAME = "internal.io.quarkus.test.junit.virtual.InternalEvents.ShutdownEvent";
 
-    String CAPTURING_STARTED_EVENT_NAME = "io.quarkus.test.junit5.virtual.internal.InternalEvents.CapturingStartedEvent";
-    String CAPTURING_STOPPED_EVENT_NAME = "io.quarkus.test.junit5.virtual.internal.InternalEvents.CapturingStoppedEvent";
+    String CAPTURING_STARTED_EVENT_NAME = "internal.io.quarkus.test.junit.virtual.InternalEvents.CapturingStartedEvent";
+    String CAPTURING_STOPPED_EVENT_NAME = "internal.io.quarkus.test.junit.virtual.InternalEvents.CapturingStoppedEvent";
 
     @Name(INITIALIZATION_EVENT_NAME)
     @Category("virtual-thread-unit")
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/JfrCollector.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/JfrCollector.java
similarity index 99%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/JfrCollector.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/JfrCollector.java
index 33faa5fea2f0f..047a3b4cda354 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/JfrCollector.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/JfrCollector.java
@@ -1,4 +1,4 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/NoJfrCollector.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/NoJfrCollector.java
similarity index 93%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/NoJfrCollector.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/NoJfrCollector.java
index 02a6c88dc0d29..ebb8f96c98f08 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/NoJfrCollector.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/NoJfrCollector.java
@@ -1,4 +1,4 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
 import java.util.List;
 
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/VirtualThreadExtension.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/VirtualThreadExtension.java
similarity index 64%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/VirtualThreadExtension.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/VirtualThreadExtension.java
index 190b56fda4f9e..7382133957f4c 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/internal/VirtualThreadExtension.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit/virtual/internal/VirtualThreadExtension.java
@@ -1,6 +1,6 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
-import static io.quarkus.test.junit5.virtual.internal.Collector.CARRIER_PINNED_EVENT_NAME;
+import static io.quarkus.test.junit.virtual.internal.Collector.CARRIER_PINNED_EVENT_NAME;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -18,9 +18,9 @@
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.extension.TestInstantiationException;
 
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.ShouldPin;
-import io.quarkus.test.junit5.virtual.ThreadPinnedEvents;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.ShouldPin;
+import io.quarkus.test.junit.virtual.ThreadPinnedEvents;
 import io.smallrye.common.annotation.SuppressForbidden;
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordedFrame;
@@ -67,41 +67,60 @@ && getShouldNotPin(extensionContext.getRequiredTestClass(),
 
     private boolean requiresRecording(Class<?> clazz, Method method) {
         if (clazz.isAnnotationPresent(ShouldNotPin.class) || clazz.isAnnotationPresent(ShouldPin.class)
-                || method.isAnnotationPresent(ShouldNotPin.class) || method.isAnnotationPresent(ShouldPin.class)) {
+                || method.isAnnotationPresent(ShouldNotPin.class) || method.isAnnotationPresent(ShouldPin.class)
+                || clazz.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldNotPin.class)
+                || clazz.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldPin.class)
+                || method.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldNotPin.class)
+                || method.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldPin.class)) {
             return true;
         }
-        return Arrays.asList(method.getParameterTypes()).contains(ThreadPinnedEvents.class);
+        return Arrays.asList(method.getParameterTypes()).contains(ThreadPinnedEvents.class)
+                || Arrays.asList(method.getParameterTypes()).contains(io.quarkus.test.junit5.virtual.ThreadPinnedEvents.class);
     }
 
-    private ShouldPin getShouldPin(Class<?> clazz, Method method) {
+    private ShouldPinRecord getShouldPin(Class<?> clazz, Method method) {
         if (method.isAnnotationPresent(ShouldPin.class)) {
-            return method.getAnnotation(ShouldPin.class);
+            return ShouldPinRecord.of(method.getAnnotation(ShouldPin.class));
+        }
+        if (method.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldPin.class)) {
+            return ShouldPinRecord.of(method.getAnnotation(io.quarkus.test.junit5.virtual.ShouldPin.class));
         }
 
-        if (method.isAnnotationPresent(ShouldNotPin.class)) {
+        if (method.isAnnotationPresent(ShouldNotPin.class) ||
+                method.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldNotPin.class)) {
             // If the method overrides the class annotation.
             return null;
         }
 
         if (clazz.isAnnotationPresent(ShouldPin.class)) {
-            return clazz.getAnnotation(ShouldPin.class);
+            return ShouldPinRecord.of(clazz.getAnnotation(ShouldPin.class));
+        }
+        if (clazz.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldPin.class)) {
+            return ShouldPinRecord.of(clazz.getAnnotation(io.quarkus.test.junit5.virtual.ShouldPin.class));
         }
 
         return null;
     }
 
-    private ShouldNotPin getShouldNotPin(Class<?> clazz, Method method) {
+    private ShouldNotPinRecord getShouldNotPin(Class<?> clazz, Method method) {
         if (method.isAnnotationPresent(ShouldNotPin.class)) {
-            return method.getAnnotation(ShouldNotPin.class);
+            return ShouldNotPinRecord.of(method.getAnnotation(ShouldNotPin.class));
+        }
+        if (method.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldNotPin.class)) {
+            return ShouldNotPinRecord.of(method.getAnnotation(io.quarkus.test.junit5.virtual.ShouldNotPin.class));
         }
 
-        if (method.isAnnotationPresent(ShouldPin.class)) {
+        if (method.isAnnotationPresent(ShouldPin.class) ||
+                method.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldPin.class)) {
             // If the method overrides the class annotation.
             return null;
         }
 
         if (clazz.isAnnotationPresent(ShouldNotPin.class)) {
-            return clazz.getAnnotation(ShouldNotPin.class);
+            return ShouldNotPinRecord.of(clazz.getAnnotation(ShouldNotPin.class));
+        }
+        if (clazz.isAnnotationPresent(io.quarkus.test.junit5.virtual.ShouldNotPin.class)) {
+            return ShouldNotPinRecord.of(clazz.getAnnotation(io.quarkus.test.junit5.virtual.ShouldNotPin.class));
         }
 
         return null;
@@ -128,8 +147,8 @@ public void afterEach(ExtensionContext extensionContext) {
         List<RecordedEvent> pinEvents = captured.stream()
                 .filter(re -> re.getEventType().getName().equals(CARRIER_PINNED_EVENT_NAME)).collect(Collectors.toList());
 
-        ShouldPin pin = getShouldPin(clazz, method);
-        ShouldNotPin notpin = getShouldNotPin(clazz, method);
+        ShouldPinRecord pin = getShouldPin(clazz, method);
+        ShouldNotPinRecord notpin = getShouldNotPin(clazz, method);
 
         if (pin != null) {
             if (pinEvents.isEmpty()) {
@@ -172,7 +191,8 @@ private String dump(List<RecordedEvent> pinEvents) {
     @Override
     public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
             throws ParameterResolutionException {
-        return parameterContext.getParameter().getType().equals(ThreadPinnedEvents.class);
+        return parameterContext.getParameter().getType().equals(ThreadPinnedEvents.class) ||
+                parameterContext.getParameter().getType().equals(io.quarkus.test.junit5.virtual.ThreadPinnedEvents.class);
     }
 
     @Override
@@ -184,4 +204,33 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
         };
     }
 
+    /**
+     * @deprecated Remove as soon as we remove the junit5 package as we won't need this abstration anymore
+     */
+    @Deprecated(since = "3.31", forRemoval = true)
+    private record ShouldPinRecord(int atMost) {
+
+        static ShouldPinRecord of(ShouldPin pin) {
+            return new ShouldPinRecord(pin.atMost());
+        }
+
+        static ShouldPinRecord of(io.quarkus.test.junit5.virtual.ShouldPin pin) {
+            return new ShouldPinRecord(pin.atMost());
+        }
+    }
+
+    /**
+     * @deprecated Remove as soon as we remove the junit5 package as we won't need this abstration anymore
+     */
+    @Deprecated(since = "3.31", forRemoval = true)
+    private record ShouldNotPinRecord(int atMost) {
+
+        static ShouldNotPinRecord of(ShouldNotPin pin) {
+            return new ShouldNotPinRecord(pin.atMost());
+        }
+
+        static ShouldNotPinRecord of(io.quarkus.test.junit5.virtual.ShouldNotPin pin) {
+            return new ShouldNotPinRecord(pin.atMost());
+        }
+    }
 }
diff --git a/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldNotPin.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldNotPin.java
new file mode 100644
index 0000000000000..899cd209ac888
--- /dev/null
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldNotPin.java
@@ -0,0 +1,28 @@
+package io.quarkus.test.junit5.virtual;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marker indicating that the test method or class should not pin the carrier thread.
+ * If, during the execution of the test, a virtual thread pins the carrier thread, the test fails.
+ * However, occasional pin can still be allowed by setting {@code atMost} value
+ *
+ * @deprecated use {@link io.quarkus.test.junit.virtual.ShouldNotPin} instead
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Inherited
+@Deprecated(since = "3.31", forRemoval = true)
+public @interface ShouldNotPin {
+
+    /**
+     * Set value to allow occasional pin events
+     *
+     * @return
+     */
+    int atMost() default 0;
+}
diff --git a/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldPin.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldPin.java
new file mode 100644
index 0000000000000..824663c3c9b09
--- /dev/null
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ShouldPin.java
@@ -0,0 +1,23 @@
+package io.quarkus.test.junit5.virtual;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the method or class can pin. At most can be set to indicate the maximum number of events.
+ * If, during the execution of the test, a virtual thread does not pin the carrier thread, or pins it more than
+ * the given {@code atMost} value, the test fails.
+ *
+ * @deprecated use {@link io.quarkus.test.junit.virtual.ShouldPin} instead
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Inherited
+@Deprecated(since = "3.31", forRemoval = true)
+public @interface ShouldPin {
+    int atMost() default Integer.MAX_VALUE;
+
+}
diff --git a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ThreadPinnedEvents.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ThreadPinnedEvents.java
similarity index 74%
rename from independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ThreadPinnedEvents.java
rename to independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ThreadPinnedEvents.java
index 296566af8d31f..e86269d904303 100644
--- a/independent-projects/junit5-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ThreadPinnedEvents.java
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/ThreadPinnedEvents.java
@@ -9,7 +9,10 @@
  * It gives controlled on the captured events, and so let you do manual checks.
  * <p>
  * The returned list is a copy of the list of captured events.
+ *
+ * @deprecated use {@link io.quarkus.test.junit.virtual.ThreadPinnedEvents} instead
  */
+@Deprecated(since = "3.31", forRemoval = true)
 public interface ThreadPinnedEvents {
 
     List<RecordedEvent> getEvents();
diff --git a/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/VirtualThreadUnit.java b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/VirtualThreadUnit.java
new file mode 100644
index 0000000000000..514531249a676
--- /dev/null
+++ b/independent-projects/junit-virtual-threads/src/main/java/io/quarkus/test/junit5/virtual/VirtualThreadUnit.java
@@ -0,0 +1,37 @@
+package io.quarkus.test.junit5.virtual;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.quarkus.test.junit.virtual.internal.VirtualThreadExtension;
+
+/**
+ * Extends the test case to detect pinned carrier thread.
+ * <br/>
+ * <br/>
+ * <b>Implementation notes:</b> current implementation uses JFR under the hood, with two consequences:
+ * <ol>
+ * <li>This test won’t work on JVM without JFR support, e.g. OpenJ9.</li>
+ * <li>Each test that uses this annotation is several seconds longer than versions without it.</li>
+ * </ol>
+ * This annotation uses JFR recording to detect pinning and analyze when a specific event is fired.
+ * Unfortunately, to ensure no events are missed, the test must ensure the JFR recording is on and off.
+ * It fires a mock event and wait until it read it.
+ * Due to JFR recording API limitations, it takes a lot of time to do these loops as there are many file reads.
+ * This adds several seconds to start and to stop to each test with pinned carrier thread detection enabled; and this
+ * additional work is mandatory to avoid missing event.
+ * <br/>
+ * This behaviour is not part of API and may change in future version.
+ *
+ * @deprecated use {@link io.quarkus.test.junit.virtual.VirtualThreadUnit} instead
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(VirtualThreadExtension.class)
+@Deprecated(since = "3.31", forRemoval = true)
+public @interface VirtualThreadUnit {
+}
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/JUnitEngine.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/JUnitEngine.java
similarity index 96%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/JUnitEngine.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/JUnitEngine.java
index 1da2015711a4b..835b9145d53e4 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/JUnitEngine.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/JUnitEngine.java
@@ -1,4 +1,4 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
 import static org.junit.platform.testkit.engine.EventConditions.*;
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/LoomUnitExampleTest.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/LoomUnitExampleTest.java
similarity index 73%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/LoomUnitExampleTest.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/LoomUnitExampleTest.java
index 7879941e88c25..568c9c7aa95e5 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/LoomUnitExampleTest.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/LoomUnitExampleTest.java
@@ -1,12 +1,12 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.ShouldPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.ShouldPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @VirtualThreadUnit
 public class LoomUnitExampleTest {
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ShouldNotPinTest.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ShouldNotPinTest.java
similarity index 75%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ShouldNotPinTest.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ShouldNotPinTest.java
index 6a8216f54466b..891c3ddf4d492 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ShouldNotPinTest.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ShouldNotPinTest.java
@@ -1,7 +1,7 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
-import static io.quarkus.test.junit5.virtual.internal.JUnitEngine.runTestAndAssertFailure;
-import static io.quarkus.test.junit5.virtual.internal.JUnitEngine.runTestAndAssertSuccess;
+import static io.quarkus.test.junit.virtual.internal.JUnitEngine.runTestAndAssertFailure;
+import static io.quarkus.test.junit.virtual.internal.JUnitEngine.runTestAndAssertSuccess;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import java.util.stream.Stream;
@@ -14,10 +14,10 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import io.quarkus.test.junit5.virtual.internal.ignore.LoomUnitExampleOnMethodTest;
-import io.quarkus.test.junit5.virtual.internal.ignore.LoomUnitExampleShouldNotPinOnClassTest;
-import io.quarkus.test.junit5.virtual.internal.ignore.LoomUnitExampleShouldNotPinOnSuperClassTest;
-import io.quarkus.test.junit5.virtual.internal.ignore.LoomUnitExampleShouldPinOnSuperClassTest;
+import io.quarkus.test.junit.virtual.internal.ignore.LoomUnitExampleOnMethodTest;
+import io.quarkus.test.junit.virtual.internal.ignore.LoomUnitExampleShouldNotPinOnClassTest;
+import io.quarkus.test.junit.virtual.internal.ignore.LoomUnitExampleShouldNotPinOnSuperClassTest;
+import io.quarkus.test.junit.virtual.internal.ignore.LoomUnitExampleShouldPinOnSuperClassTest;
 
 @DisabledIfSystemProperty(named = "java.runtime.name", matches = ".*Semeru.*", disabledReason = "Semeru doesn't support JFR yet")
 public class ShouldNotPinTest {
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ShouldPinTest.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ShouldPinTest.java
similarity index 73%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ShouldPinTest.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ShouldPinTest.java
index 42fe4dabbfca3..c89d63ac8ac74 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ShouldPinTest.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ShouldPinTest.java
@@ -1,6 +1,6 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
-import static io.quarkus.test.junit5.virtual.internal.JUnitEngine.runTestAndAssertFailure;
+import static io.quarkus.test.junit.virtual.internal.JUnitEngine.runTestAndAssertFailure;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import java.util.stream.Stream;
@@ -12,10 +12,10 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import io.quarkus.test.junit5.virtual.internal.ignore.LoomUnitExampleOnMethodTest;
-import io.quarkus.test.junit5.virtual.internal.ignore.LoomUnitExampleShouldNotPinOnClassTest;
-import io.quarkus.test.junit5.virtual.internal.ignore.LoomUnitExampleShouldNotPinOnSuperClassTest;
-import io.quarkus.test.junit5.virtual.internal.ignore.LoomUnitExampleShouldPinOnSuperClassTest;
+import io.quarkus.test.junit.virtual.internal.ignore.LoomUnitExampleOnMethodTest;
+import io.quarkus.test.junit.virtual.internal.ignore.LoomUnitExampleShouldNotPinOnClassTest;
+import io.quarkus.test.junit.virtual.internal.ignore.LoomUnitExampleShouldNotPinOnSuperClassTest;
+import io.quarkus.test.junit.virtual.internal.ignore.LoomUnitExampleShouldPinOnSuperClassTest;
 
 @DisabledIfSystemProperty(named = "java.runtime.name", matches = ".*Semeru.*", disabledReason = "Semeru doesn't support JFR yet")
 public class ShouldPinTest {
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/TestPinJfrEvent.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/TestPinJfrEvent.java
similarity index 77%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/TestPinJfrEvent.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/TestPinJfrEvent.java
index 27ed1bc43e757..d67e31f59e8c7 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/TestPinJfrEvent.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/TestPinJfrEvent.java
@@ -1,6 +1,6 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
-import static io.quarkus.test.junit5.virtual.internal.Collector.CARRIER_PINNED_EVENT_NAME;
+import static io.quarkus.test.junit.virtual.internal.Collector.CARRIER_PINNED_EVENT_NAME;
 
 import jdk.jfr.*;
 
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/VirtualThreadExtensionTest.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/VirtualThreadExtensionTest.java
similarity index 84%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/VirtualThreadExtensionTest.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/VirtualThreadExtensionTest.java
index 2be329d4ad7ca..c3614bd098b7a 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/VirtualThreadExtensionTest.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/VirtualThreadExtensionTest.java
@@ -1,6 +1,6 @@
-package io.quarkus.test.junit5.virtual.internal;
+package io.quarkus.test.junit.virtual.internal;
 
-import static io.quarkus.test.junit5.virtual.internal.VirtualThreadExtension._COLLECTOR_KEY;
+import static io.quarkus.test.junit.virtual.internal.VirtualThreadExtension._COLLECTOR_KEY;
 import static org.assertj.core.api.Assertions.*;
 
 import java.lang.reflect.AnnotatedElement;
@@ -13,6 +13,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -24,8 +25,8 @@
 import org.junit.jupiter.api.function.ThrowingConsumer;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.ShouldPin;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.ShouldPin;
 import jdk.jfr.consumer.RecordedEvent;
 
 class VirtualThreadExtensionTest {
@@ -195,13 +196,13 @@ public Optional<String> getConfigurationParameter(String s) {
         }
 
         @Override
-        public <T> Optional<T> getConfigurationParameter(String s, Function<String, T> function) {
+        public <T> Optional<T> getConfigurationParameter(String key,
+                Function<? super String, ? extends @Nullable T> transformer) {
             return Optional.empty();
         }
 
         @Override
         public void publishReportEntry(Map<String, String> map) {
-
         }
 
         @Override
@@ -209,6 +210,11 @@ public TestStore getStore(Namespace namespace) {
             return store;
         }
 
+        @Override
+        public Store getStore(StoreScope scope, Namespace namespace) {
+            return store;
+        }
+
         @Override
         public ExecutionMode getExecutionMode() {
             return ExecutionMode.SAME_THREAD;
@@ -229,12 +235,11 @@ public void publishFile(String name, MediaType mediaType, ThrowingConsumer<Path>
         }
 
         @Override
-        public void publishDirectory(String name, ThrowingConsumer<Path> action) {
+        public void publishFile(String name, org.junit.jupiter.api.MediaType mediaType, ThrowingConsumer<Path> action) {
         }
 
         @Override
-        public Store getStore(StoreScope scope, Namespace namespace) {
-            return null;
+        public void publishDirectory(String name, ThrowingConsumer<Path> action) {
         }
     }
 
@@ -276,15 +281,29 @@ public <V> V get(Object o, Class<V> aClass) {
         }
 
         @Override
-        @SuppressWarnings("unchecked")
-        public <K, V> Object getOrComputeIfAbsent(K key, Function<K, V> function) {
-            return store.computeIfAbsent(key, o -> function.apply((K) o));
+        public <V> V getOrDefault(Object key, Class<V> requiredType, V defaultValue) {
+            return requiredType.cast(store.getOrDefault(key, defaultValue));
         }
 
         @Override
-        @SuppressWarnings("unchecked")
-        public <K, V> V getOrComputeIfAbsent(K key, Function<K, V> function, Class<V> aClass) {
-            return aClass.cast(store.computeIfAbsent(key, o -> function.apply((K) o)));
+        public @Nullable <K, V> Object getOrComputeIfAbsent(K key, Function<? super K, ? extends V> defaultCreator) {
+            return store.computeIfAbsent(key, o -> defaultCreator.apply((K) o));
+        }
+
+        @Override
+        public <K, V> Object computeIfAbsent(K key, Function<? super K, ? extends V> defaultCreator) {
+            return store.computeIfAbsent(key, o -> defaultCreator.apply((K) o));
+        }
+
+        @Override
+        public <K, V> @Nullable V getOrComputeIfAbsent(K key, Function<? super K, ? extends V> defaultCreator,
+                Class<V> requiredType) {
+            return requiredType.cast(store.computeIfAbsent(key, o -> defaultCreator.apply((K) o)));
+        }
+
+        @Override
+        public <K, V> V computeIfAbsent(K key, Function<? super K, ? extends V> defaultCreator, Class<V> requiredType) {
+            return requiredType.cast(store.computeIfAbsent(key, o -> defaultCreator.apply((K) o)));
         }
 
         @Override
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleOnMethodTest.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleOnMethodTest.java
similarity index 62%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleOnMethodTest.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleOnMethodTest.java
index 84623f4723aa8..1bec960748073 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleOnMethodTest.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleOnMethodTest.java
@@ -1,11 +1,11 @@
-package io.quarkus.test.junit5.virtual.internal.ignore;
+package io.quarkus.test.junit.virtual.internal.ignore;
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.ShouldPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
-import io.quarkus.test.junit5.virtual.internal.TestPinJfrEvent;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.ShouldPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.internal.TestPinJfrEvent;
 
 @VirtualThreadUnit
 public class LoomUnitExampleOnMethodTest {
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnClassTest.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnClassTest.java
similarity index 65%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnClassTest.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnClassTest.java
index 5fef87cd94d09..f3d13efb6c687 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnClassTest.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnClassTest.java
@@ -1,11 +1,11 @@
-package io.quarkus.test.junit5.virtual.internal.ignore;
+package io.quarkus.test.junit.virtual.internal.ignore;
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.ShouldPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
-import io.quarkus.test.junit5.virtual.internal.TestPinJfrEvent;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.ShouldPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.internal.TestPinJfrEvent;
 
 @VirtualThreadUnit
 @ShouldNotPin // You can use @ShouldNotPin or @ShouldPin on the class itself, it's applied to each method.
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClass.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClass.java
similarity index 54%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClass.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClass.java
index 4741e9e31cd5b..5a2d40e5c4cd1 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClass.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClass.java
@@ -1,7 +1,7 @@
-package io.quarkus.test.junit5.virtual.internal.ignore;
+package io.quarkus.test.junit.virtual.internal.ignore;
 
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @VirtualThreadUnit
 @ShouldNotPin // You can use @ShouldNotPin or @ShouldPin on the super class itself, it's applied to each method.
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClassTest.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClassTest.java
similarity index 75%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClassTest.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClassTest.java
index 25b2cc82e521f..51834921741a9 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClassTest.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldNotPinOnSuperClassTest.java
@@ -1,9 +1,9 @@
-package io.quarkus.test.junit5.virtual.internal.ignore;
+package io.quarkus.test.junit.virtual.internal.ignore;
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.junit5.virtual.ShouldPin;
-import io.quarkus.test.junit5.virtual.internal.TestPinJfrEvent;
+import io.quarkus.test.junit.virtual.ShouldPin;
+import io.quarkus.test.junit.virtual.internal.TestPinJfrEvent;
 
 public class LoomUnitExampleShouldNotPinOnSuperClassTest extends LoomUnitExampleShouldNotPinOnSuperClass {
 
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClass.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClass.java
similarity index 54%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClass.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClass.java
index 4cc571619671a..2647e68b425ff 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClass.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClass.java
@@ -1,7 +1,7 @@
-package io.quarkus.test.junit5.virtual.internal.ignore;
+package io.quarkus.test.junit.virtual.internal.ignore;
 
-import io.quarkus.test.junit5.virtual.ShouldPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @VirtualThreadUnit
 @ShouldPin // You can use @ShouldNotPin or @ShouldPin on the super class itself, it's applied to each method.
diff --git a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClassTest.java b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClassTest.java
similarity index 69%
rename from independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClassTest.java
rename to independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClassTest.java
index 322b024b1a88d..38c4c51609164 100644
--- a/independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClassTest.java
+++ b/independent-projects/junit-virtual-threads/src/test/java/io/quarkus/test/junit/virtual/internal/ignore/LoomUnitExampleShouldPinOnSuperClassTest.java
@@ -1,9 +1,9 @@
-package io.quarkus.test.junit5.virtual.internal.ignore;
+package io.quarkus.test.junit.virtual.internal.ignore;
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.internal.TestPinJfrEvent;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.internal.TestPinJfrEvent;
 
 public class LoomUnitExampleShouldPinOnSuperClassTest extends LoomUnitExampleShouldPinOnSuperClass {
 
diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml
index a396c68d28652..4df3dbfcd95c3 100644
--- a/independent-projects/qute/pom.xml
+++ b/independent-projects/qute/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.junit>5.13.4</version.junit>
+        <version.junit>6.0.1</version.junit>
         <version.assertj>3.27.6</version.assertj>
         <version.jandex>3.5.3</version.jandex>
         <version.gizmo2>2.0.0.CR1</version.gizmo2>
@@ -71,7 +71,7 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- JUnit 5 dependencies, imported as a BOM -->
+            <!-- JUnit dependencies, imported as a BOM -->
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index 6b5d1ea1ac422..2403564ca79e7 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -46,7 +46,7 @@
         <jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
         <jandex.version>3.5.3</jandex.version>
         <bytebuddy.version>1.17.6</bytebuddy.version>
-        <junit5.version>5.13.4</junit5.version>
+        <junit.version>6.0.1</junit.version>
         <maven.version>3.9.11</maven.version>
         <assertj.version>3.27.6</assertj.version>
         <jboss-logging.version>3.6.1.Final</jboss-logging.version>
@@ -262,11 +262,11 @@
                 <type>pom</type>
             </dependency>
 
-            <!-- JUnit 5 dependencies, imported as a BOM -->
+            <!-- JUnit dependencies, imported as a BOM -->
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>${junit5.version}</version>
+                <version>${junit.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/pom.tpl.qute.xml
index 83e3cf1eb8451..f7b7c8a152bc8 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/pom.tpl.qute.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/pom.tpl.qute.xml
index 1db2b1840b7a9..d98fe35e3444b 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/pom.tpl.qute.xml
@@ -38,7 +38,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute
index f7c1fea500561..ec6d475366e44 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute
@@ -36,7 +36,7 @@ dependencies {
 {#for dep in dependencies}
     implementation("{dep}")
 {/for}
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
 {#for dep in test-dependencies}
     testImplementation("{dep}")
 {/for}
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute
index 118cc470eefce..e781895f8a603 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute
@@ -32,7 +32,7 @@ dependencies {
 {#for dep in dependencies}
     implementation '{dep}'
 {/for}
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
 {#for dep in test-dependencies}
     testImplementation '{dep}'
 {/for}
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml
index 612d7da2f0451..ebc62546619c0 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml
@@ -103,7 +103,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         {#each test-dependencies}
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
index f474755c2a7b8..a3019eddeda3b 100644
--- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
+++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
@@ -825,7 +825,7 @@ public TestPlatformCatalogMemberBuilder addDefaultCodestartExtensions() {
 
             Dependency dep = new Dependency();
             dep.setGroupId("io.quarkus");
-            dep.setArtifactId("quarkus-junit5");
+            dep.setArtifactId("quarkus-junit");
             dep.setVersion(quarkusVersion);
             pom.getDependencyManagement().addDependency(dep);
 
diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
index 9278f02098380..90fc741acb31e 100644
--- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
+++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
index 265ad3cf16782..29444e3a491e1 100644
--- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
+++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index 0245f429a469b..cbd9824e1a254 100644
--- a/independent-projects/tools/pom.xml
+++ b/independent-projects/tools/pom.xml
@@ -53,7 +53,7 @@
         <assertj.version>3.27.6</assertj.version>
         <jackson-bom.version>2.20.1</jackson-bom.version>
         <jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
-        <junit5.version>5.13.4</junit5.version>
+        <junit.version>6.0.1</junit.version>
         <commons-compress.version>1.28.0</commons-compress.version>
         <jboss-logging.version>3.6.1.Final</jboss-logging.version>
         <mockito.version>5.21.0</mockito.version>
@@ -102,11 +102,11 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- JUnit 5 dependencies, imported as a BOM -->
+            <!-- JUnit dependencies, imported as a BOM -->
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>${junit5.version}</version>
+                <version>${junit.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/integration-tests/amazon-lambda-http-resteasy-reactive/pom.xml b/integration-tests/amazon-lambda-http-resteasy-reactive/pom.xml
index 1037b6d3d9329..015f11c85e4da 100644
--- a/integration-tests/amazon-lambda-http-resteasy-reactive/pom.xml
+++ b/integration-tests/amazon-lambda-http-resteasy-reactive/pom.xml
@@ -25,7 +25,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/amazon-lambda-http/pom.xml b/integration-tests/amazon-lambda-http/pom.xml
index 2d797af3d764b..89948fbb72a86 100644
--- a/integration-tests/amazon-lambda-http/pom.xml
+++ b/integration-tests/amazon-lambda-http/pom.xml
@@ -41,7 +41,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/amazon-lambda-rest-funqy/pom.xml b/integration-tests/amazon-lambda-rest-funqy/pom.xml
index 62edff0bf212e..cd982af837932 100644
--- a/integration-tests/amazon-lambda-rest-funqy/pom.xml
+++ b/integration-tests/amazon-lambda-rest-funqy/pom.xml
@@ -29,7 +29,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/amazon-lambda-rest-reactive-routes/pom.xml b/integration-tests/amazon-lambda-rest-reactive-routes/pom.xml
index 60207c326ebdd..0a61ee9a91ae0 100644
--- a/integration-tests/amazon-lambda-rest-reactive-routes/pom.xml
+++ b/integration-tests/amazon-lambda-rest-reactive-routes/pom.xml
@@ -29,7 +29,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/amazon-lambda-rest-resteasy-reactive/pom.xml b/integration-tests/amazon-lambda-rest-resteasy-reactive/pom.xml
index aa09da904da27..38d7a36783f3f 100644
--- a/integration-tests/amazon-lambda-rest-resteasy-reactive/pom.xml
+++ b/integration-tests/amazon-lambda-rest-resteasy-reactive/pom.xml
@@ -29,7 +29,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/amazon-lambda-rest-servlet/pom.xml b/integration-tests/amazon-lambda-rest-servlet/pom.xml
index 9ab3bdd6096ee..126a9dcd35f5f 100644
--- a/integration-tests/amazon-lambda-rest-servlet/pom.xml
+++ b/integration-tests/amazon-lambda-rest-servlet/pom.xml
@@ -29,7 +29,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/amazon-lambda-s3event/pom.xml b/integration-tests/amazon-lambda-s3event/pom.xml
index b1e32c841f182..dd271e78476f6 100644
--- a/integration-tests/amazon-lambda-s3event/pom.xml
+++ b/integration-tests/amazon-lambda-s3event/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/amazon-lambda-stream-handler/pom.xml b/integration-tests/amazon-lambda-stream-handler/pom.xml
index 8493c54cc79a2..11360b02494c5 100644
--- a/integration-tests/amazon-lambda-stream-handler/pom.xml
+++ b/integration-tests/amazon-lambda-stream-handler/pom.xml
@@ -21,7 +21,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/amazon-lambda/pom.xml b/integration-tests/amazon-lambda/pom.xml
index 3194a0670c7f4..fab17e3958af1 100644
--- a/integration-tests/amazon-lambda/pom.xml
+++ b/integration-tests/amazon-lambda/pom.xml
@@ -25,7 +25,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/avro-reload/pom.xml b/integration-tests/avro-reload/pom.xml
index 9aec94a838dc9..e90374b85828d 100644
--- a/integration-tests/avro-reload/pom.xml
+++ b/integration-tests/avro-reload/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/awt-packaging/pom.xml b/integration-tests/awt-packaging/pom.xml
index 48fcc57afbf21..9cd8201bee78e 100644
--- a/integration-tests/awt-packaging/pom.xml
+++ b/integration-tests/awt-packaging/pom.xml
@@ -37,12 +37,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/awt/pom.xml b/integration-tests/awt/pom.xml
index aacda1d852a3e..c48c2a33aa895 100644
--- a/integration-tests/awt/pom.xml
+++ b/integration-tests/awt/pom.xml
@@ -35,7 +35,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/bouncycastle-fips-jsse/pom.xml b/integration-tests/bouncycastle-fips-jsse/pom.xml
index 43d17b35ab833..7f96bb81072e2 100644
--- a/integration-tests/bouncycastle-fips-jsse/pom.xml
+++ b/integration-tests/bouncycastle-fips-jsse/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/bouncycastle-fips/pom.xml b/integration-tests/bouncycastle-fips/pom.xml
index 3a3945fb9ac29..00dfe860a3756 100644
--- a/integration-tests/bouncycastle-fips/pom.xml
+++ b/integration-tests/bouncycastle-fips/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/bouncycastle-jsse/pom.xml b/integration-tests/bouncycastle-jsse/pom.xml
index 300b22890ea06..1326d8db3ad7e 100644
--- a/integration-tests/bouncycastle-jsse/pom.xml
+++ b/integration-tests/bouncycastle-jsse/pom.xml
@@ -34,7 +34,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/bouncycastle/pom.xml b/integration-tests/bouncycastle/pom.xml
index 0b8b35df24130..1d3f1ad82fa0a 100644
--- a/integration-tests/bouncycastle/pom.xml
+++ b/integration-tests/bouncycastle/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/cache-multiple-backends/pom.xml b/integration-tests/cache-multiple-backends/pom.xml
index b0c1747fc31a6..7edb48465847b 100644
--- a/integration-tests/cache-multiple-backends/pom.xml
+++ b/integration-tests/cache-multiple-backends/pom.xml
@@ -35,7 +35,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/cache/pom.xml b/integration-tests/cache/pom.xml
index 7480d012166b2..a035be9c60681 100644
--- a/integration-tests/cache/pom.xml
+++ b/integration-tests/cache/pom.xml
@@ -42,7 +42,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/command-mode/pom.xml b/integration-tests/command-mode/pom.xml
index 683b95a882f57..f551adad23c55 100644
--- a/integration-tests/command-mode/pom.xml
+++ b/integration-tests/command-mode/pom.xml
@@ -35,12 +35,12 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/compose-devservices/pom.xml b/integration-tests/compose-devservices/pom.xml
index efa16e800337b..669e7dad42d4e 100644
--- a/integration-tests/compose-devservices/pom.xml
+++ b/integration-tests/compose-devservices/pom.xml
@@ -59,7 +59,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
index 3afc45c3557ab..b60ec0eff5aca 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
index 480724f5cabb7..1d981acbee0b9 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml
index d6dac3dce1b80..dd2aeb829fca6 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
index 316ae23698a1e..c267c8426d164 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
@@ -47,7 +47,7 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
index 715b928fa7b32..e3c90afeed574 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
index d00629eebbe22..e7d33aba8d9f4 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-native-main/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-native-main/pom.xml
index ccc112de4db0f..1dad81ffdbcd1 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-native-main/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-native-main/pom.xml
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integration-tests/container-image/quarkus-standard-way/pom.xml b/integration-tests/container-image/quarkus-standard-way/pom.xml
index eeff5e1a2fe9f..b4b3ef54763ac 100644
--- a/integration-tests/container-image/quarkus-standard-way/pom.xml
+++ b/integration-tests/container-image/quarkus-standard-way/pom.xml
@@ -32,7 +32,7 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -47,7 +47,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/integration-tests/devmode/pom.xml b/integration-tests/devmode/pom.xml
index 56bd0c0fa32a8..76eed9a3b4a98 100644
--- a/integration-tests/devmode/pom.xml
+++ b/integration-tests/devmode/pom.xml
@@ -86,20 +86,20 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- quarkus-junit5 provides QuarkusTestConfigProviderResolver
+        <!-- quarkus-junit provides QuarkusTestConfigProviderResolver
            that overrides io.quarkus.test.config.TestConfigProviderResolver
            to avoid Context ClassLoader mismatch -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-component</artifactId>
+            <artifactId>quarkus-junit-component</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/devtools-registry-client/pom.xml b/integration-tests/devtools-registry-client/pom.xml
index 41f50d45d0201..7ba97ab8fad99 100644
--- a/integration-tests/devtools-registry-client/pom.xml
+++ b/integration-tests/devtools-registry-client/pom.xml
@@ -27,7 +27,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/devtools/pom.xml b/integration-tests/devtools/pom.xml
index 4c16999a91e3b..4be6e4fde6ecd 100644
--- a/integration-tests/devtools/pom.xml
+++ b/integration-tests/devtools/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleContent/build.gradle b/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleContent/build.gradle
index 1a7c504c536d9..c2dfe0e8d1f50 100644
--- a/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleContent/build.gradle
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleContent/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
     implementation 'io.quarkus:quarkus-arc'
     implementation 'io.quarkus:quarkus-rest'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleKotlinContent/build.gradle.kts b/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleKotlinContent/build.gradle.kts
index f60af26470e28..585cbe6c25a9c 100644
--- a/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleKotlinContent/build.gradle.kts
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testGradleKotlinContent/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testMavenContent/pom.xml b/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testMavenContent/pom.xml
index a940ef7539813..246795e7e28b9 100644
--- a/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testMavenContent/pom.xml
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/KotlinSerializationCodestartTest/testMavenContent/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/elasticsearch-java-client/pom.xml b/integration-tests/elasticsearch-java-client/pom.xml
index bc8c6349e4590..934f4971c9c46 100644
--- a/integration-tests/elasticsearch-java-client/pom.xml
+++ b/integration-tests/elasticsearch-java-client/pom.xml
@@ -29,7 +29,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml
index 7c5624252c87c..fb9aa7e127fbe 100644
--- a/integration-tests/elasticsearch-rest-client/pom.xml
+++ b/integration-tests/elasticsearch-rest-client/pom.xml
@@ -29,7 +29,7 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/elytron-resteasy-reactive/pom.xml b/integration-tests/elytron-resteasy-reactive/pom.xml
index 1230ab601162a..cb46d39c8f621 100644
--- a/integration-tests/elytron-resteasy-reactive/pom.xml
+++ b/integration-tests/elytron-resteasy-reactive/pom.xml
@@ -26,7 +26,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/elytron-resteasy/pom.xml b/integration-tests/elytron-resteasy/pom.xml
index d1acb501541b7..9357e8a83d630 100644
--- a/integration-tests/elytron-resteasy/pom.xml
+++ b/integration-tests/elytron-resteasy/pom.xml
@@ -26,7 +26,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/elytron-security-jdbc/pom.xml b/integration-tests/elytron-security-jdbc/pom.xml
index dd88dda824f47..c9e336054c005 100644
--- a/integration-tests/elytron-security-jdbc/pom.xml
+++ b/integration-tests/elytron-security-jdbc/pom.xml
@@ -34,7 +34,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/elytron-security-ldap/pom.xml b/integration-tests/elytron-security-ldap/pom.xml
index 62fae013207a2..bda5628c2c809 100644
--- a/integration-tests/elytron-security-ldap/pom.xml
+++ b/integration-tests/elytron-security-ldap/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/elytron-security-oauth2/pom.xml b/integration-tests/elytron-security-oauth2/pom.xml
index ef85223a17c24..38dcde6844fe3 100644
--- a/integration-tests/elytron-security-oauth2/pom.xml
+++ b/integration-tests/elytron-security-oauth2/pom.xml
@@ -27,7 +27,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/elytron-security/pom.xml b/integration-tests/elytron-security/pom.xml
index 36b3a9ca66088..c2645f67939e1 100644
--- a/integration-tests/elytron-security/pom.xml
+++ b/integration-tests/elytron-security/pom.xml
@@ -28,7 +28,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/elytron-undertow/pom.xml b/integration-tests/elytron-undertow/pom.xml
index 4111e03fee8fd..94cb9cb9e1cac 100644
--- a/integration-tests/elytron-undertow/pom.xml
+++ b/integration-tests/elytron-undertow/pom.xml
@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/flyway/pom.xml b/integration-tests/flyway/pom.xml
index f3e8edfd37802..99eef18841c8d 100644
--- a/integration-tests/flyway/pom.xml
+++ b/integration-tests/flyway/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -46,7 +46,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/funqy-amazon-lambda/pom.xml b/integration-tests/funqy-amazon-lambda/pom.xml
index 3b9310bc5c225..a9dd2db7f4c77 100644
--- a/integration-tests/funqy-amazon-lambda/pom.xml
+++ b/integration-tests/funqy-amazon-lambda/pom.xml
@@ -24,12 +24,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/funqy-google-cloud-functions/pom.xml b/integration-tests/funqy-google-cloud-functions/pom.xml
index 0a35c83c9320e..3ebfe47a1d01a 100644
--- a/integration-tests/funqy-google-cloud-functions/pom.xml
+++ b/integration-tests/funqy-google-cloud-functions/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/google-cloud-functions-http/pom.xml b/integration-tests/google-cloud-functions-http/pom.xml
index 20ed75ceb2b2a..64e8514010287 100644
--- a/integration-tests/google-cloud-functions-http/pom.xml
+++ b/integration-tests/google-cloud-functions-http/pom.xml
@@ -37,7 +37,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/google-cloud-functions/pom.xml b/integration-tests/google-cloud-functions/pom.xml
index a7a1afd40fafa..bc4c3f921e25e 100644
--- a/integration-tests/google-cloud-functions/pom.xml
+++ b/integration-tests/google-cloud-functions/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/gradle/pom.xml b/integration-tests/gradle/pom.xml
index 727a53586884b..ce1a4b6cbedbc 100644
--- a/integration-tests/gradle/pom.xml
+++ b/integration-tests/gradle/pom.xml
@@ -134,15 +134,15 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-component</artifactId>
+            <artifactId>quarkus-junit-component</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/integration-tests/gradle/src/main/resources/add-remove-extension-single-module-kts/build.gradle.kts b/integration-tests/gradle/src/main/resources/add-remove-extension-single-module-kts/build.gradle.kts
index 73bf12728325f..a69efa2d38ce7 100644
--- a/integration-tests/gradle/src/main/resources/add-remove-extension-single-module-kts/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/add-remove-extension-single-module-kts/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
     implementation("io.quarkus:quarkus-resteasy")
 
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/add-remove-extension-single-module/build.gradle b/integration-tests/gradle/src/main/resources/add-remove-extension-single-module/build.gradle
index 1ec1ffdfe0f19..52483b63e76ff 100644
--- a/integration-tests/gradle/src/main/resources/add-remove-extension-single-module/build.gradle
+++ b/integration-tests/gradle/src/main/resources/add-remove-extension-single-module/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/additional-source-sets/build.gradle b/integration-tests/gradle/src/main/resources/additional-source-sets/build.gradle
index 42ab6c130dbad..793292fe8f8a9 100644
--- a/integration-tests/gradle/src/main/resources/additional-source-sets/build.gradle
+++ b/integration-tests/gradle/src/main/resources/additional-source-sets/build.gradle
@@ -16,7 +16,7 @@ repositories {
 dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation "io.quarkus:quarkus-arc"
-    testImplementation "io.quarkus:quarkus-junit5"
+    testImplementation "io.quarkus:quarkus-junit"
 }
 
 sourceSets {
diff --git a/integration-tests/gradle/src/main/resources/annotation-processor-multi-module/build.gradle b/integration-tests/gradle/src/main/resources/annotation-processor-multi-module/build.gradle
index 24f5c3425225c..8d9153a7d3e3e 100644
--- a/integration-tests/gradle/src/main/resources/annotation-processor-multi-module/build.gradle
+++ b/integration-tests/gradle/src/main/resources/annotation-processor-multi-module/build.gradle
@@ -42,7 +42,7 @@ subprojects {
 
         implementation 'io.quarkus:quarkus-resteasy'
 
-        testImplementation 'io.quarkus:quarkus-junit5'
+        testImplementation 'io.quarkus:quarkus-junit'
         testImplementation 'io.rest-assured:rest-assured'
 
         implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
diff --git a/integration-tests/gradle/src/main/resources/annotation-processor-simple-module/build.gradle b/integration-tests/gradle/src/main/resources/annotation-processor-simple-module/build.gradle
index f807c9dada26d..cb7e25bfd2bbd 100644
--- a/integration-tests/gradle/src/main/resources/annotation-processor-simple-module/build.gradle
+++ b/integration-tests/gradle/src/main/resources/annotation-processor-simple-module/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 
     annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
diff --git a/integration-tests/gradle/src/main/resources/basic-java-library-module/application/build.gradle b/integration-tests/gradle/src/main/resources/basic-java-library-module/application/build.gradle
index 0150cf471dedd..593b828714f99 100644
--- a/integration-tests/gradle/src/main/resources/basic-java-library-module/application/build.gradle
+++ b/integration-tests/gradle/src/main/resources/basic-java-library-module/application/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
     implementation project(':library')
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/build.gradle b/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/build.gradle
index e774ba76b1b6c..9f899936c2539 100644
--- a/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/build.gradle
+++ b/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-resteasy'
 
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/basic-multi-module-project-jacoco/build.gradle b/integration-tests/gradle/src/main/resources/basic-multi-module-project-jacoco/build.gradle
index b7942ad0948bd..5e06183702a38 100644
--- a/integration-tests/gradle/src/main/resources/basic-multi-module-project-jacoco/build.gradle
+++ b/integration-tests/gradle/src/main/resources/basic-multi-module-project-jacoco/build.gradle
@@ -42,7 +42,7 @@ subprojects {
 
         implementation 'io.quarkus:quarkus-rest'
 
-        testImplementation 'io.quarkus:quarkus-junit5'
+        testImplementation 'io.quarkus:quarkus-junit'
         testImplementation 'io.rest-assured:rest-assured'
 
         implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
diff --git a/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/build.gradle b/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/build.gradle
index 1dfaeb6a0dfbe..266f4210887b4 100644
--- a/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/build.gradle
+++ b/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/build.gradle
@@ -45,7 +45,7 @@ subprojects {
 
         implementation 'io.quarkus:quarkus-arc'
 
-        testImplementation 'io.quarkus:quarkus-junit5'
+        testImplementation 'io.quarkus:quarkus-junit'
         testImplementation 'io.rest-assured:rest-assured'
 
         implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
diff --git a/integration-tests/gradle/src/main/resources/basic-multi-module-project/build.gradle b/integration-tests/gradle/src/main/resources/basic-multi-module-project/build.gradle
index 24f5c3425225c..8d9153a7d3e3e 100644
--- a/integration-tests/gradle/src/main/resources/basic-multi-module-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/basic-multi-module-project/build.gradle
@@ -42,7 +42,7 @@ subprojects {
 
         implementation 'io.quarkus:quarkus-resteasy'
 
-        testImplementation 'io.quarkus:quarkus-junit5'
+        testImplementation 'io.quarkus:quarkus-junit'
         testImplementation 'io.rest-assured:rest-assured'
 
         implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle
index eddad434a61ce..e471e82eae744 100644
--- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-resteasy'
     implementation 'io.quarkus:quarkus-kotlin'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/build.gradle b/integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/build.gradle
index 748dba45083b6..a2ca07778b036 100644
--- a/integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/build.gradle
+++ b/integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/build.gradle b/integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/build.gradle
index 4bebe9013b8da..7a59e58adaaf2 100644
--- a/integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/build.gradle
+++ b/integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/build-configuration/without-configuration/build.gradle b/integration-tests/gradle/src/main/resources/build-configuration/without-configuration/build.gradle
index 1ec1ffdfe0f19..52483b63e76ff 100644
--- a/integration-tests/gradle/src/main/resources/build-configuration/without-configuration/build.gradle
+++ b/integration-tests/gradle/src/main/resources/build-configuration/without-configuration/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/compile-only-lombok/build.gradle b/integration-tests/gradle/src/main/resources/compile-only-lombok/build.gradle
index ac0371f3eb5fd..b2317d5e282d3 100644
--- a/integration-tests/gradle/src/main/resources/compile-only-lombok/build.gradle
+++ b/integration-tests/gradle/src/main/resources/compile-only-lombok/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     annotationProcessor "org.hibernate.orm:hibernate-processor"
     annotationProcessor enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/build.gradle b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/build.gradle
index 5a1c23b61f466..7201d520add07 100644
--- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/build.gradle
+++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-jdbc-h2'
     implementation 'io.quarkus:quarkus-arc'
     implementation 'io.quarkus:quarkus-resteasy'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-rest/build.gradle b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-rest/build.gradle
index 319213dd3be0f..bf8a8364f4932 100644
--- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-rest/build.gradle
+++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-rest/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-resteasy-jackson'
     implementation 'io.quarkus:quarkus-arc'
     implementation 'org.acme.gradle.multi:gradle-dao:1.0.0-SNAPSHOT'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts
index 264c71a3e0cff..f49392d5cf7e0 100644
--- a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-hibernate-validator")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-exclude/build.gradle b/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-exclude/build.gradle
index 15c7407c62aa1..c6efb97d61ac6 100644
--- a/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-exclude/build.gradle
+++ b/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-exclude/build.gradle
@@ -24,6 +24,6 @@ dependencies {
     }
     implementation 'org.acme:ext-c:1.0-SNAPSHOT'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
diff --git a/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-explicit-import/build.gradle b/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-explicit-import/build.gradle
index 45d6b6b687441..f6b8760ae4e30 100644
--- a/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-explicit-import/build.gradle
+++ b/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-explicit-import/build.gradle
@@ -23,6 +23,6 @@ dependencies {
     implementation 'org.acme:ext-c:1.0-SNAPSHOT'
     implementation 'org.acme:ext-e:1.0-SNAPSHOT'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
diff --git a/integration-tests/gradle/src/main/resources/conditional-test-project/runner/build.gradle b/integration-tests/gradle/src/main/resources/conditional-test-project/runner/build.gradle
index e62a8d1c3476b..456459d7c90d0 100644
--- a/integration-tests/gradle/src/main/resources/conditional-test-project/runner/build.gradle
+++ b/integration-tests/gradle/src/main/resources/conditional-test-project/runner/build.gradle
@@ -23,6 +23,6 @@ dependencies {
     implementation 'org.acme:ext-c:1.0-SNAPSHOT'
     implementation 'org.acme:ext-t:1.0-SNAPSHOT'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
diff --git a/integration-tests/gradle/src/main/resources/conditional-test-project/scenario-two/build.gradle b/integration-tests/gradle/src/main/resources/conditional-test-project/scenario-two/build.gradle
index 70526b6fb7c89..139786f91d01d 100644
--- a/integration-tests/gradle/src/main/resources/conditional-test-project/scenario-two/build.gradle
+++ b/integration-tests/gradle/src/main/resources/conditional-test-project/scenario-two/build.gradle
@@ -23,6 +23,6 @@ dependencies {
     implementation 'org.acme:ext-l:1.0-SNAPSHOT'
     implementation 'org.acme:ext-m:1.0-SNAPSHOT'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
diff --git a/integration-tests/gradle/src/main/resources/configuration-inheritance-project/build.gradle b/integration-tests/gradle/src/main/resources/configuration-inheritance-project/build.gradle
index e671d255b5ccd..bee4566b51054 100644
--- a/integration-tests/gradle/src/main/resources/configuration-inheritance-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/configuration-inheritance-project/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
 
     implementation 'io.quarkus:quarkus-resteasy'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 
     implementation 'org.apache.commons:commons-collections4:4.4'
diff --git a/integration-tests/gradle/src/main/resources/custom-filesystem-provider/build.gradle b/integration-tests/gradle/src/main/resources/custom-filesystem-provider/build.gradle
index 7a2145a3c0717..4b37764be4471 100644
--- a/integration-tests/gradle/src/main/resources/custom-filesystem-provider/build.gradle
+++ b/integration-tests/gradle/src/main/resources/custom-filesystem-provider/build.gradle
@@ -44,7 +44,7 @@ subprojects {
 
         implementation 'io.quarkus:quarkus-resteasy'
 
-        testImplementation 'io.quarkus:quarkus-junit5'
+        testImplementation 'io.quarkus:quarkus-junit'
         testImplementation 'io.rest-assured:rest-assured'
 
         implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
diff --git a/integration-tests/gradle/src/main/resources/custom-jar-classifier-dependency/runner/build.gradle b/integration-tests/gradle/src/main/resources/custom-jar-classifier-dependency/runner/build.gradle
index 4d07f44e1b0fc..0eefa9f48472b 100644
--- a/integration-tests/gradle/src/main/resources/custom-jar-classifier-dependency/runner/build.gradle
+++ b/integration-tests/gradle/src/main/resources/custom-jar-classifier-dependency/runner/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-rest'
     implementation 'io.quarkus:quarkus-arc'
     implementation project(':project-a')
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/custom-jar-classifier/build.gradle b/integration-tests/gradle/src/main/resources/custom-jar-classifier/build.gradle
index b4b8fe8cbbabd..bd19289a7ec35 100644
--- a/integration-tests/gradle/src/main/resources/custom-jar-classifier/build.gradle
+++ b/integration-tests/gradle/src/main/resources/custom-jar-classifier/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-rest'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/build.gradle b/integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/build.gradle
index 7582e05d77868..cb470766e1aad 100644
--- a/integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/build.gradle
+++ b/integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/dev-deps-leak-into-prod-48992/build.gradle b/integration-tests/gradle/src/main/resources/dev-deps-leak-into-prod-48992/build.gradle
index 6c2196ff38330..016ed15844ec1 100644
--- a/integration-tests/gradle/src/main/resources/dev-deps-leak-into-prod-48992/build.gradle
+++ b/integration-tests/gradle/src/main/resources/dev-deps-leak-into-prod-48992/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-arc'
     implementation 'io.quarkus:quarkus-rest'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-enforced/build.gradle b/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-enforced/build.gradle
index 12332eeaa7c7a..d17cb3c9cdf07 100644
--- a/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-enforced/build.gradle
+++ b/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-enforced/build.gradle
@@ -20,6 +20,6 @@ dependencies {
     implementation enforcedPlatform("org.enforcing.deps:test-bom:1.0.0")
     implementation 'io.quarkus:quarkus-rest'
     implementation 'org.enforcing.deps:ext-a:1.0-SNAPSHOT'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
diff --git a/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-excluded-1/build.gradle b/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-excluded-1/build.gradle
index 118f9641c6b0e..6d8f5f1c6e68e 100644
--- a/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-excluded-1/build.gradle
+++ b/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-excluded-1/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation enforcedPlatform("org.enforcing.deps:test-bom:1.0.0")
     implementation 'io.quarkus:quarkus-rest'
     implementation 'org.enforcing.deps:ext-a:1.0-SNAPSHOT'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-excluded-2/build.gradle b/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-excluded-2/build.gradle
index 1b157d042718e..714e2fedd1e93 100644
--- a/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-excluded-2/build.gradle
+++ b/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner-excluded-2/build.gradle
@@ -20,6 +20,6 @@ dependencies {
     implementation enforcedPlatform("org.enforcing.deps:test-bom-with-exclusion:1.0.0")
     implementation 'io.quarkus:quarkus-rest'
     implementation 'org.enforcing.deps:ext-a:1.0-SNAPSHOT'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
diff --git a/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner/build.gradle b/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner/build.gradle
index ac0e616c76f5b..13dafac91b237 100644
--- a/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner/build.gradle
+++ b/integration-tests/gradle/src/main/resources/enforcing-platform-for-conditional-deps/consumer-project/runner/build.gradle
@@ -19,6 +19,6 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-rest'
     implementation 'org.enforcing.deps:ext-a:1.0-SNAPSHOT'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
diff --git a/integration-tests/gradle/src/main/resources/extensions/simple-extension/deployment/build.gradle b/integration-tests/gradle/src/main/resources/extensions/simple-extension/deployment/build.gradle
index a628f7880298e..a788f928837aa 100644
--- a/integration-tests/gradle/src/main/resources/extensions/simple-extension/deployment/build.gradle
+++ b/integration-tests/gradle/src/main/resources/extensions/simple-extension/deployment/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-core-deployment'
     implementation 'io.quarkus:quarkus-undertow-deployment'
 
-    testImplementation 'io.quarkus:quarkus-junit5-internal'
+    testImplementation 'io.quarkus:quarkus-junit-internal'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/grpc-multi-module-no-java/application/build.gradle.kts b/integration-tests/gradle/src/main/resources/grpc-multi-module-no-java/application/build.gradle.kts
index 2787624908d2e..103eeb2a2009b 100644
--- a/integration-tests/gradle/src/main/resources/grpc-multi-module-no-java/application/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/grpc-multi-module-no-java/application/build.gradle.kts
@@ -13,6 +13,6 @@ dependencies {
     implementation("io.quarkus:quarkus-grpc")
     compileOnly("com.google.protobuf:protobuf-kotlin")
 
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
diff --git a/integration-tests/gradle/src/main/resources/grpc-multi-module-project/build.gradle b/integration-tests/gradle/src/main/resources/grpc-multi-module-project/build.gradle
index ae9221f911f42..13c2e11756ab8 100644
--- a/integration-tests/gradle/src/main/resources/grpc-multi-module-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/grpc-multi-module-project/build.gradle
@@ -42,7 +42,7 @@ subprojects {
 
         implementation 'io.quarkus:quarkus-rest'
 
-        testImplementation 'io.quarkus:quarkus-junit5'
+        testImplementation 'io.quarkus:quarkus-junit'
 
         implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
 
diff --git a/integration-tests/gradle/src/main/resources/included-kotlin-build/acme-subproject-nested/acme-nested/build.gradle.kts b/integration-tests/gradle/src/main/resources/included-kotlin-build/acme-subproject-nested/acme-nested/build.gradle.kts
index ef631aefd8953..6a8eedfbe8557 100644
--- a/integration-tests/gradle/src/main/resources/included-kotlin-build/acme-subproject-nested/acme-nested/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/included-kotlin-build/acme-subproject-nested/acme-nested/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/included-kotlin-build/build.gradle.kts b/integration-tests/gradle/src/main/resources/included-kotlin-build/build.gradle.kts
index 09e73af5633a3..39b2f7fa50c20 100644
--- a/integration-tests/gradle/src/main/resources/included-kotlin-build/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/included-kotlin-build/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/included-kotlin-kmp-build/build.gradle.kts b/integration-tests/gradle/src/main/resources/included-kotlin-kmp-build/build.gradle.kts
index 42c718c4040dc..a711144dae06c 100644
--- a/integration-tests/gradle/src/main/resources/included-kotlin-kmp-build/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/included-kotlin-kmp-build/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/build.gradle b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/build.gradle
index 54e20a0b53feb..affb2616d0402 100644
--- a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/build.gradle
+++ b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
     implementation project(':library')
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
     testImplementation project(path: ':library', configuration: 'tests')
 }
diff --git a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/build.gradle b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/build.gradle
index 3ef8670227ae2..ccc2e2dc41e21 100644
--- a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/build.gradle
+++ b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     api enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     api 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/inject-quarkus-app-properties/build.gradle b/integration-tests/gradle/src/main/resources/inject-quarkus-app-properties/build.gradle
index 004177ff381a1..240689098e8e2 100644
--- a/integration-tests/gradle/src/main/resources/inject-quarkus-app-properties/build.gradle
+++ b/integration-tests/gradle/src/main/resources/inject-quarkus-app-properties/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/it-test-basic-project/build.gradle b/integration-tests/gradle/src/main/resources/it-test-basic-project/build.gradle
index 004177ff381a1..240689098e8e2 100644
--- a/integration-tests/gradle/src/main/resources/it-test-basic-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/it-test-basic-project/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/jandex-included-build-kordamp/acme-subproject-nested/acme-nested/build.gradle.kts b/integration-tests/gradle/src/main/resources/jandex-included-build-kordamp/acme-subproject-nested/acme-nested/build.gradle.kts
index 753e52b6a5f32..bda28e0af31de 100644
--- a/integration-tests/gradle/src/main/resources/jandex-included-build-kordamp/acme-subproject-nested/acme-nested/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/jandex-included-build-kordamp/acme-subproject-nested/acme-nested/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/jandex-included-build-kordamp/build.gradle.kts b/integration-tests/gradle/src/main/resources/jandex-included-build-kordamp/build.gradle.kts
index f499d30311583..e1e1b13bc4ec5 100644
--- a/integration-tests/gradle/src/main/resources/jandex-included-build-kordamp/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/jandex-included-build-kordamp/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/java-platform-with-eager-resolution-project/build.gradle.kts b/integration-tests/gradle/src/main/resources/java-platform-with-eager-resolution-project/build.gradle.kts
index adc10c534b09f..f9bf3450ec2a9 100644
--- a/integration-tests/gradle/src/main/resources/java-platform-with-eager-resolution-project/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/java-platform-with-eager-resolution-project/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     implementation("io.quarkus:quarkus-rest")
     implementation("io.quarkus:quarkus-arc")
     implementation(enforcedPlatform(project(":library")))
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle
index f1fc8236cd36f..c857295fc0680 100644
--- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-resteasy'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:kotlin-extensions'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/kotlin-jacoco/build.gradle.kts b/integration-tests/gradle/src/main/resources/kotlin-jacoco/build.gradle.kts
index 92cb3b37106ab..e6b069c7e3861 100644
--- a/integration-tests/gradle/src/main/resources/kotlin-jacoco/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/kotlin-jacoco/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-rest")
     testImplementation("io.quarkus:quarkus-jacoco")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/kotlin-ksp/build.gradle.kts b/integration-tests/gradle/src/main/resources/kotlin-ksp/build.gradle.kts
index 32ac159b25709..9c0b97981fade 100644
--- a/integration-tests/gradle/src/main/resources/kotlin-ksp/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/kotlin-ksp/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     implementation("io.quarkus:quarkus-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/kotlin-multiplatform-module/build.gradle.kts b/integration-tests/gradle/src/main/resources/kotlin-multiplatform-module/build.gradle.kts
index b6b5599847d7a..fe7ef92f5fedc 100644
--- a/integration-tests/gradle/src/main/resources/kotlin-multiplatform-module/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/kotlin-multiplatform-module/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
 
diff --git a/integration-tests/gradle/src/main/resources/list-extension-single-module/build.gradle b/integration-tests/gradle/src/main/resources/list-extension-single-module/build.gradle
index b26a9a3ba9e41..7b2936e2b15f3 100644
--- a/integration-tests/gradle/src/main/resources/list-extension-single-module/build.gradle
+++ b/integration-tests/gradle/src/main/resources/list-extension-single-module/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/maven-exclusion-in-extension-dependency/build.gradle b/integration-tests/gradle/src/main/resources/maven-exclusion-in-extension-dependency/build.gradle
index ae80ba08a28c1..a3563cf4cb755 100644
--- a/integration-tests/gradle/src/main/resources/maven-exclusion-in-extension-dependency/build.gradle
+++ b/integration-tests/gradle/src/main/resources/maven-exclusion-in-extension-dependency/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-reactive-pg-client'
     implementation 'io.quarkus:quarkus-arc'
     implementation 'io.quarkus:quarkus-rest'
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/multi-composite-build-extensions-project/application/build.gradle b/integration-tests/gradle/src/main/resources/multi-composite-build-extensions-project/application/build.gradle
index 5a58c8f8a1eb1..5a94324aac4cf 100644
--- a/integration-tests/gradle/src/main/resources/multi-composite-build-extensions-project/application/build.gradle
+++ b/integration-tests/gradle/src/main/resources/multi-composite-build-extensions-project/application/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     implementation ('org.acme.libs:libraryA')
     implementation ('org.acme.extensions:another-example-extension')
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/build.gradle b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/build.gradle
index 0cf8235e7b3a9..7db12175d47a5 100644
--- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/build.gradle
@@ -39,7 +39,7 @@ allprojects {
         implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
         implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
         implementation 'io.quarkus:quarkus-kotlin'
-        testImplementation 'io.quarkus:quarkus-junit5'
+        testImplementation 'io.quarkus:quarkus-junit'
         testImplementation 'io.rest-assured:kotlin-extensions'
     }
 
diff --git a/integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/build.gradle b/integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/build.gradle
index 55cfc3ca83469..92785b8e7a2e7 100644
--- a/integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/build.gradle
+++ b/integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/build.gradle.kts b/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/build.gradle.kts
index 87f48bdc76cdd..5dd161f2b7957 100644
--- a/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/build.gradle.kts
@@ -35,7 +35,7 @@ subprojects {
   dependencies {
     "implementation"(enforcedPlatform("$quarkusPlatformGroupId:$quarkusPlatformArtifactId:$quarkusPlatformVersion"))
 
-    "testImplementation"("io.quarkus:quarkus-junit5")
+    "testImplementation"("io.quarkus:quarkus-junit")
     "testImplementation"("io.rest-assured:rest-assured")
   }
 
diff --git a/integration-tests/gradle/src/main/resources/multi-module-with-lib-module/lib-mod/build.gradle.kts b/integration-tests/gradle/src/main/resources/multi-module-with-lib-module/lib-mod/build.gradle.kts
index 2f278f53b3650..b9a8962fea092 100644
--- a/integration-tests/gradle/src/main/resources/multi-module-with-lib-module/lib-mod/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/multi-module-with-lib-module/lib-mod/build.gradle.kts
@@ -12,6 +12,6 @@ val quarkusPlatformVersion: String by project
 dependencies {
     "implementation"(enforcedPlatform("$quarkusPlatformGroupId:$quarkusPlatformArtifactId:$quarkusPlatformVersion"))
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
 }
diff --git a/integration-tests/gradle/src/main/resources/multi-module-with-lib-module/main-mod/build.gradle.kts b/integration-tests/gradle/src/main/resources/multi-module-with-lib-module/main-mod/build.gradle.kts
index c48a7cb1fdae3..cb49a8ce82661 100644
--- a/integration-tests/gradle/src/main/resources/multi-module-with-lib-module/main-mod/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/multi-module-with-lib-module/main-mod/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     "implementation"(enforcedPlatform("$quarkusPlatformGroupId:$quarkusPlatformArtifactId:$quarkusPlatformVersion"))
 
     implementation("io.quarkus:quarkus-rest")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
     testImplementation("io.rest-assured:rest-assured")
     implementation(project(":lib-mod"))
 }
diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle
index d953a76e72c13..c75d6f1009d8a 100644
--- a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-resteasy'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:kotlin-extensions'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/mutable-jar/build.gradle b/integration-tests/gradle/src/main/resources/mutable-jar/build.gradle
index 1ec1ffdfe0f19..52483b63e76ff 100644
--- a/integration-tests/gradle/src/main/resources/mutable-jar/build.gradle
+++ b/integration-tests/gradle/src/main/resources/mutable-jar/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/quarkus-component-test/build.gradle b/integration-tests/gradle/src/main/resources/quarkus-component-test/build.gradle
index 5f1cfa1aefb14..ebfb316973611 100644
--- a/integration-tests/gradle/src/main/resources/quarkus-component-test/build.gradle
+++ b/integration-tests/gradle/src/main/resources/quarkus-component-test/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-arc'
 
-    testImplementation 'io.quarkus:quarkus-junit5-component'
+    testImplementation 'io.quarkus:quarkus-junit-component'
 }
 
 group = 'org.acme'
diff --git a/integration-tests/gradle/src/main/resources/system-props-as-build-time-config-source/application/build.gradle b/integration-tests/gradle/src/main/resources/system-props-as-build-time-config-source/application/build.gradle
index 42a5ccf79056d..ccf3761eafed7 100644
--- a/integration-tests/gradle/src/main/resources/system-props-as-build-time-config-source/application/build.gradle
+++ b/integration-tests/gradle/src/main/resources/system-props-as-build-time-config-source/application/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-rest'
     implementation ('org.acme.extensions:example-extension')
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/test-fixtures-client-exception-mapper/build.gradle.kts b/integration-tests/gradle/src/main/resources/test-fixtures-client-exception-mapper/build.gradle.kts
index 91f967b70b147..7d6e0811c37a3 100644
--- a/integration-tests/gradle/src/main/resources/test-fixtures-client-exception-mapper/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/test-fixtures-client-exception-mapper/build.gradle.kts
@@ -16,7 +16,7 @@ val quarkusPlatformVersion: String by project
 dependencies {
     implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
     implementation("io.quarkus:quarkus-rest-client-jackson")
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
 }
 
 group = "org.example"
diff --git a/integration-tests/gradle/src/main/resources/test-fixtures-module-with-package-private-parent/build.gradle b/integration-tests/gradle/src/main/resources/test-fixtures-module-with-package-private-parent/build.gradle
index 7d9ee518d72dc..dbaf7de5378d1 100644
--- a/integration-tests/gradle/src/main/resources/test-fixtures-module-with-package-private-parent/build.gradle
+++ b/integration-tests/gradle/src/main/resources/test-fixtures-module-with-package-private-parent/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/test-fixtures-module/build.gradle b/integration-tests/gradle/src/main/resources/test-fixtures-module/build.gradle
index 7d9ee518d72dc..dbaf7de5378d1 100644
--- a/integration-tests/gradle/src/main/resources/test-fixtures-module/build.gradle
+++ b/integration-tests/gradle/src/main/resources/test-fixtures-module/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/test-fixtures-multi-module/application/build.gradle b/integration-tests/gradle/src/main/resources/test-fixtures-multi-module/application/build.gradle
index 816585dc52aa8..71654879c7558 100644
--- a/integration-tests/gradle/src/main/resources/test-fixtures-multi-module/application/build.gradle
+++ b/integration-tests/gradle/src/main/resources/test-fixtures-multi-module/application/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
     // Library-2 has to be dependency as implementation and test fixture
     implementation(project(':library-2'))
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
     testImplementation(testFixtures(project(':library-2')))
 }
diff --git a/integration-tests/gradle/src/main/resources/test-fixtures-multi-module/library-2/build.gradle b/integration-tests/gradle/src/main/resources/test-fixtures-multi-module/library-2/build.gradle
index 4cb25677a40f5..bae5dd7d24949 100644
--- a/integration-tests/gradle/src/main/resources/test-fixtures-multi-module/library-2/build.gradle
+++ b/integration-tests/gradle/src/main/resources/test-fixtures-multi-module/library-2/build.gradle
@@ -16,7 +16,7 @@ repositories {
 
 dependencies {
     testFixturesImplementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-    testFixturesImplementation 'io.quarkus:quarkus-junit5'
+    testFixturesImplementation 'io.quarkus:quarkus-junit'
 
     // Library-1 has to be dependency as implementation and test fixture
     testFixturesImplementation(project(':library-1'))
diff --git a/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/application/build.gradle b/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/application/build.gradle
index eefc07de28ead..113dfc79c6a4d 100644
--- a/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/application/build.gradle
+++ b/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/application/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     implementation project(":runtime")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
diff --git a/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/build.gradle b/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/build.gradle
index 004177ff381a1..240689098e8e2 100644
--- a/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/build.gradle
+++ b/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/test-selection/build.gradle.kts b/integration-tests/gradle/src/main/resources/test-selection/build.gradle.kts
index 7fbced9a7ff52..99f6561dec4a9 100644
--- a/integration-tests/gradle/src/main/resources/test-selection/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/test-selection/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-vertx-http")
 
-    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.quarkus:quarkus-junit")
 }
 
 group = "com.example"
diff --git a/integration-tests/gradle/src/main/resources/test-with-sidecar-module/my-module/build.gradle b/integration-tests/gradle/src/main/resources/test-with-sidecar-module/my-module/build.gradle
index d8f5b7df31ff2..c98ac7d815d5a 100644
--- a/integration-tests/gradle/src/main/resources/test-with-sidecar-module/my-module/build.gradle
+++ b/integration-tests/gradle/src/main/resources/test-with-sidecar-module/my-module/build.gradle
@@ -19,5 +19,5 @@ dependencies {
     implementation "io.quarkus:quarkus-arc"
 
     testImplementation project(":test-support")
-    testImplementation "io.quarkus:quarkus-junit5"
+    testImplementation "io.quarkus:quarkus-junit"
 }
diff --git a/integration-tests/gradle/src/main/resources/with-junit-properties-file/build.gradle b/integration-tests/gradle/src/main/resources/with-junit-properties-file/build.gradle
index 4d5d34d764813..70806c7120064 100644
--- a/integration-tests/gradle/src/main/resources/with-junit-properties-file/build.gradle
+++ b/integration-tests/gradle/src/main/resources/with-junit-properties-file/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.quarkus:quarkus-junit'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
diff --git a/integration-tests/grpc-cli/pom.xml b/integration-tests/grpc-cli/pom.xml
index 5ad42a85afacb..8b3c6f66d0874 100644
--- a/integration-tests/grpc-cli/pom.xml
+++ b/integration-tests/grpc-cli/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/grpc-descriptor-sets/pom.xml b/integration-tests/grpc-descriptor-sets/pom.xml
index 69457d3be8a88..26a956217e541 100644
--- a/integration-tests/grpc-descriptor-sets/pom.xml
+++ b/integration-tests/grpc-descriptor-sets/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-exceptions/pom.xml b/integration-tests/grpc-exceptions/pom.xml
index 601e2ce9aeb2a..8d9b87061a753 100644
--- a/integration-tests/grpc-exceptions/pom.xml
+++ b/integration-tests/grpc-exceptions/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-external-proto-test/pom.xml b/integration-tests/grpc-external-proto-test/pom.xml
index af2ce8888b4e2..48e87097b99fc 100644
--- a/integration-tests/grpc-external-proto-test/pom.xml
+++ b/integration-tests/grpc-external-proto-test/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-health/pom.xml b/integration-tests/grpc-health/pom.xml
index d4293d0e3e1c4..b21ec215e313c 100644
--- a/integration-tests/grpc-health/pom.xml
+++ b/integration-tests/grpc-health/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-hibernate-reactive/pom.xml b/integration-tests/grpc-hibernate-reactive/pom.xml
index bbe86471af698..2e015ca024e90 100644
--- a/integration-tests/grpc-hibernate-reactive/pom.xml
+++ b/integration-tests/grpc-hibernate-reactive/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-hibernate/pom.xml b/integration-tests/grpc-hibernate/pom.xml
index 2f166746f0483..f666b5c61aa66 100644
--- a/integration-tests/grpc-hibernate/pom.xml
+++ b/integration-tests/grpc-hibernate/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-inprocess/pom.xml b/integration-tests/grpc-inprocess/pom.xml
index c032dd87a1a17..a671e0228d638 100644
--- a/integration-tests/grpc-inprocess/pom.xml
+++ b/integration-tests/grpc-inprocess/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/grpc-interceptors/pom.xml b/integration-tests/grpc-interceptors/pom.xml
index 5c8e740f5f7ce..d1215520ff210 100644
--- a/integration-tests/grpc-interceptors/pom.xml
+++ b/integration-tests/grpc-interceptors/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-mutual-auth/pom.xml b/integration-tests/grpc-mutual-auth/pom.xml
index aad1397ff2caa..e3f8c4a10b232 100644
--- a/integration-tests/grpc-mutual-auth/pom.xml
+++ b/integration-tests/grpc-mutual-auth/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-plain-text-gzip/pom.xml b/integration-tests/grpc-plain-text-gzip/pom.xml
index a8558d9e6fe22..97a3326938f4a 100644
--- a/integration-tests/grpc-plain-text-gzip/pom.xml
+++ b/integration-tests/grpc-plain-text-gzip/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-plain-text-mutiny/pom.xml b/integration-tests/grpc-plain-text-mutiny/pom.xml
index 7b29e6ba73059..41c9aa0e58325 100644
--- a/integration-tests/grpc-plain-text-mutiny/pom.xml
+++ b/integration-tests/grpc-plain-text-mutiny/pom.xml
@@ -28,7 +28,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -48,7 +48,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-mockito</artifactId>
+      <artifactId>quarkus-junit-mockito</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/grpc-proto-v2/pom.xml b/integration-tests/grpc-proto-v2/pom.xml
index ade7f4a66d76b..4b2ea7bcabf1f 100644
--- a/integration-tests/grpc-proto-v2/pom.xml
+++ b/integration-tests/grpc-proto-v2/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-stork-response-time/pom.xml b/integration-tests/grpc-stork-response-time/pom.xml
index 5bd800b8fc0bd..8be6364655db7 100644
--- a/integration-tests/grpc-stork-response-time/pom.xml
+++ b/integration-tests/grpc-stork-response-time/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/grpc-stork-simple/pom.xml b/integration-tests/grpc-stork-simple/pom.xml
index 7500fd12cc7ef..e5c57936795eb 100644
--- a/integration-tests/grpc-stork-simple/pom.xml
+++ b/integration-tests/grpc-stork-simple/pom.xml
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-streaming/pom.xml b/integration-tests/grpc-streaming/pom.xml
index 69d738f08283b..f2569426e86b6 100644
--- a/integration-tests/grpc-streaming/pom.xml
+++ b/integration-tests/grpc-streaming/pom.xml
@@ -31,7 +31,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-test-random-port/pom.xml b/integration-tests/grpc-test-random-port/pom.xml
index 254af0a50bc11..93b43dc6cf798 100644
--- a/integration-tests/grpc-test-random-port/pom.xml
+++ b/integration-tests/grpc-test-random-port/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-tls-p12/pom.xml b/integration-tests/grpc-tls-p12/pom.xml
index 0e7a121943d7e..ef98aebe8e66a 100644
--- a/integration-tests/grpc-tls-p12/pom.xml
+++ b/integration-tests/grpc-tls-p12/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-tls/pom.xml b/integration-tests/grpc-tls/pom.xml
index 16fdfe120501e..288a93d6ff9a4 100644
--- a/integration-tests/grpc-tls/pom.xml
+++ b/integration-tests/grpc-tls/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/grpc-vertx/pom.xml b/integration-tests/grpc-vertx/pom.xml
index 45f1ccb4ccbe9..8125c4dafbc42 100644
--- a/integration-tests/grpc-vertx/pom.xml
+++ b/integration-tests/grpc-vertx/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-compatibility-5.6/mariadb/pom.xml b/integration-tests/hibernate-orm-compatibility-5.6/mariadb/pom.xml
index c09b4da9c2d0d..bf913c0a08e5c 100644
--- a/integration-tests/hibernate-orm-compatibility-5.6/mariadb/pom.xml
+++ b/integration-tests/hibernate-orm-compatibility-5.6/mariadb/pom.xml
@@ -48,7 +48,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-compatibility-5.6/postgresql/pom.xml b/integration-tests/hibernate-orm-compatibility-5.6/postgresql/pom.xml
index 1f17ef7fbab9f..64809549af295 100644
--- a/integration-tests/hibernate-orm-compatibility-5.6/postgresql/pom.xml
+++ b/integration-tests/hibernate-orm-compatibility-5.6/postgresql/pom.xml
@@ -48,7 +48,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-data/pom.xml b/integration-tests/hibernate-orm-data/pom.xml
index c5e78c63740cc..0c237f157318a 100644
--- a/integration-tests/hibernate-orm-data/pom.xml
+++ b/integration-tests/hibernate-orm-data/pom.xml
@@ -37,12 +37,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-envers/pom.xml b/integration-tests/hibernate-orm-envers/pom.xml
index 2feb61c9872b4..d204895092af7 100644
--- a/integration-tests/hibernate-orm-envers/pom.xml
+++ b/integration-tests/hibernate-orm-envers/pom.xml
@@ -36,7 +36,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-graphql-panache/pom.xml b/integration-tests/hibernate-orm-graphql-panache/pom.xml
index f0dea0e9be140..ab75728930a5a 100644
--- a/integration-tests/hibernate-orm-graphql-panache/pom.xml
+++ b/integration-tests/hibernate-orm-graphql-panache/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-jpamodelgen/pom.xml b/integration-tests/hibernate-orm-jpamodelgen/pom.xml
index 6385cca16c66a..162998895f038 100644
--- a/integration-tests/hibernate-orm-jpamodelgen/pom.xml
+++ b/integration-tests/hibernate-orm-jpamodelgen/pom.xml
@@ -37,12 +37,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-panache-kotlin/pom.xml b/integration-tests/hibernate-orm-panache-kotlin/pom.xml
index bbffc72296c1f..89a32aacd5bd1 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/pom.xml
+++ b/integration-tests/hibernate-orm-panache-kotlin/pom.xml
@@ -46,7 +46,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-panache/pom.xml b/integration-tests/hibernate-orm-panache/pom.xml
index 8daf3d2de244d..5786d6fd743ef 100644
--- a/integration-tests/hibernate-orm-panache/pom.xml
+++ b/integration-tests/hibernate-orm-panache/pom.xml
@@ -64,12 +64,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-rest-data-panache/pom.xml b/integration-tests/hibernate-orm-rest-data-panache/pom.xml
index 4ba0870fdf870..80d176fe89936 100644
--- a/integration-tests/hibernate-orm-rest-data-panache/pom.xml
+++ b/integration-tests/hibernate-orm-rest-data-panache/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/pom.xml b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/pom.xml
index 65f9d7fb4b99a..6c1297ca114c7 100644
--- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/pom.xml
+++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/pom.xml
@@ -51,7 +51,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/pom.xml b/integration-tests/hibernate-orm-tenancy/connection-resolver/pom.xml
index a6a7602c53965..33b2895c96ff2 100644
--- a/integration-tests/hibernate-orm-tenancy/connection-resolver/pom.xml
+++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/pom.xml
@@ -49,7 +49,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-tenancy/datasource/pom.xml b/integration-tests/hibernate-orm-tenancy/datasource/pom.xml
index 432e4b342aba5..e67887e19dcc3 100644
--- a/integration-tests/hibernate-orm-tenancy/datasource/pom.xml
+++ b/integration-tests/hibernate-orm-tenancy/datasource/pom.xml
@@ -51,7 +51,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-tenancy/discriminator/pom.xml b/integration-tests/hibernate-orm-tenancy/discriminator/pom.xml
index 717941c2d5e1a..0a4cc28786797 100644
--- a/integration-tests/hibernate-orm-tenancy/discriminator/pom.xml
+++ b/integration-tests/hibernate-orm-tenancy/discriminator/pom.xml
@@ -39,7 +39,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-tenancy/schema-mariadb/pom.xml b/integration-tests/hibernate-orm-tenancy/schema-mariadb/pom.xml
index 788f485f567b7..51eb8f7a6828c 100644
--- a/integration-tests/hibernate-orm-tenancy/schema-mariadb/pom.xml
+++ b/integration-tests/hibernate-orm-tenancy/schema-mariadb/pom.xml
@@ -47,7 +47,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-orm-tenancy/schema/pom.xml b/integration-tests/hibernate-orm-tenancy/schema/pom.xml
index f99e1a5ad600f..97db076d37f01 100644
--- a/integration-tests/hibernate-orm-tenancy/schema/pom.xml
+++ b/integration-tests/hibernate-orm-tenancy/schema/pom.xml
@@ -47,7 +47,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-db2/pom.xml b/integration-tests/hibernate-reactive-db2/pom.xml
index 58c3c27762ba1..0231042cc1e74 100644
--- a/integration-tests/hibernate-reactive-db2/pom.xml
+++ b/integration-tests/hibernate-reactive-db2/pom.xml
@@ -30,7 +30,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-mariadb/pom.xml b/integration-tests/hibernate-reactive-mariadb/pom.xml
index bef91b602ae50..bcde307aa1df5 100644
--- a/integration-tests/hibernate-reactive-mariadb/pom.xml
+++ b/integration-tests/hibernate-reactive-mariadb/pom.xml
@@ -34,7 +34,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-mssql/pom.xml b/integration-tests/hibernate-reactive-mssql/pom.xml
index 99c688ac285b5..1b02b6bab7e75 100644
--- a/integration-tests/hibernate-reactive-mssql/pom.xml
+++ b/integration-tests/hibernate-reactive-mssql/pom.xml
@@ -30,12 +30,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml b/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml
index aa989a4f2c630..d7d2431bf75df 100644
--- a/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml
+++ b/integration-tests/hibernate-reactive-mysql-agroal-flyway/pom.xml
@@ -46,7 +46,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-mysql/pom.xml b/integration-tests/hibernate-reactive-mysql/pom.xml
index 4028293dd7ea9..a1e87e8424b46 100644
--- a/integration-tests/hibernate-reactive-mysql/pom.xml
+++ b/integration-tests/hibernate-reactive-mysql/pom.xml
@@ -30,7 +30,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-oracle/pom.xml b/integration-tests/hibernate-reactive-oracle/pom.xml
index 67e10d0d66740..3ec32d9552d5d 100644
--- a/integration-tests/hibernate-reactive-oracle/pom.xml
+++ b/integration-tests/hibernate-reactive-oracle/pom.xml
@@ -34,7 +34,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-orm-compatibility/pom.xml b/integration-tests/hibernate-reactive-orm-compatibility/pom.xml
index edef453491828..997a989f1ecae 100644
--- a/integration-tests/hibernate-reactive-orm-compatibility/pom.xml
+++ b/integration-tests/hibernate-reactive-orm-compatibility/pom.xml
@@ -48,7 +48,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-panache-kotlin/pom.xml b/integration-tests/hibernate-reactive-panache-kotlin/pom.xml
index 14f3d179f58d8..28be0210d1ebd 100644
--- a/integration-tests/hibernate-reactive-panache-kotlin/pom.xml
+++ b/integration-tests/hibernate-reactive-panache-kotlin/pom.xml
@@ -50,7 +50,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-panache/pom.xml b/integration-tests/hibernate-reactive-panache/pom.xml
index 0c41f320ab89d..4476d31f501e2 100644
--- a/integration-tests/hibernate-reactive-panache/pom.xml
+++ b/integration-tests/hibernate-reactive-panache/pom.xml
@@ -59,7 +59,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -69,7 +69,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-reactive-postgresql/pom.xml b/integration-tests/hibernate-reactive-postgresql/pom.xml
index 0c858cfb2b9a7..120e93710ab33 100644
--- a/integration-tests/hibernate-reactive-postgresql/pom.xml
+++ b/integration-tests/hibernate-reactive-postgresql/pom.xml
@@ -38,7 +38,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml
index 8a971809a5f91..5ca79ca5a3eaf 100644
--- a/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml
+++ b/integration-tests/hibernate-search-orm-elasticsearch-outbox-polling/pom.xml
@@ -47,7 +47,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml
index d87ccc11f39db..dc667c47a4422 100644
--- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml
+++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml
@@ -43,7 +43,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml
index 37e7c2d2611d7..f09cebef8486d 100644
--- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml
+++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml
@@ -42,7 +42,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-search-orm-opensearch/pom.xml b/integration-tests/hibernate-search-orm-opensearch/pom.xml
index ea81abc4137ac..b9d55d9a2f545 100644
--- a/integration-tests/hibernate-search-orm-opensearch/pom.xml
+++ b/integration-tests/hibernate-search-orm-opensearch/pom.xml
@@ -38,7 +38,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-search-standalone-elasticsearch/pom.xml b/integration-tests/hibernate-search-standalone-elasticsearch/pom.xml
index 0985b67313247..50c1ec80c3773 100644
--- a/integration-tests/hibernate-search-standalone-elasticsearch/pom.xml
+++ b/integration-tests/hibernate-search-standalone-elasticsearch/pom.xml
@@ -34,7 +34,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-search-standalone-opensearch/pom.xml b/integration-tests/hibernate-search-standalone-opensearch/pom.xml
index 175e60f79c474..b009852be02ae 100644
--- a/integration-tests/hibernate-search-standalone-opensearch/pom.xml
+++ b/integration-tests/hibernate-search-standalone-opensearch/pom.xml
@@ -34,7 +34,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-validator-resteasy-reactive/pom.xml b/integration-tests/hibernate-validator-resteasy-reactive/pom.xml
index 7cff86b97d15b..0ef123ec5f434 100644
--- a/integration-tests/hibernate-validator-resteasy-reactive/pom.xml
+++ b/integration-tests/hibernate-validator-resteasy-reactive/pom.xml
@@ -52,12 +52,12 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/hibernate-validator/pom.xml b/integration-tests/hibernate-validator/pom.xml
index 7aa7c9dac6714..6d2c4c94c9f32 100644
--- a/integration-tests/hibernate-validator/pom.xml
+++ b/integration-tests/hibernate-validator/pom.xml
@@ -48,12 +48,12 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/infinispan-cache-jpa/pom.xml b/integration-tests/infinispan-cache-jpa/pom.xml
index 6aaa46558fe12..f1082a9d7e578 100644
--- a/integration-tests/infinispan-cache-jpa/pom.xml
+++ b/integration-tests/infinispan-cache-jpa/pom.xml
@@ -32,7 +32,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/infinispan-cache/pom.xml b/integration-tests/infinispan-cache/pom.xml
index dde07306e0864..14bbbd9e358c9 100644
--- a/integration-tests/infinispan-cache/pom.xml
+++ b/integration-tests/infinispan-cache/pom.xml
@@ -28,7 +28,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/infinispan-client/pom.xml b/integration-tests/infinispan-client/pom.xml
index 1febec1b4217c..9cf25628035d8 100644
--- a/integration-tests/infinispan-client/pom.xml
+++ b/integration-tests/infinispan-client/pom.xml
@@ -37,7 +37,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/integration-tests/injectmock/pom.xml b/integration-tests/injectmock/pom.xml
index 554a4e3deb5a1..5393fbe51b0ae 100644
--- a/integration-tests/injectmock/pom.xml
+++ b/integration-tests/injectmock/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/istio/maven-invoker-way/pom.xml b/integration-tests/istio/maven-invoker-way/pom.xml
index ebeeaeacfb9fb..5abd31e85535d 100644
--- a/integration-tests/istio/maven-invoker-way/pom.xml
+++ b/integration-tests/istio/maven-invoker-way/pom.xml
@@ -199,7 +199,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>
diff --git a/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml b/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml
index 38f71920863c4..11b35b204c52c 100644
--- a/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml
+++ b/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/jackson/pom.xml b/integration-tests/jackson/pom.xml
index 853f3aa344ab5..414a348832bca 100644
--- a/integration-tests/jackson/pom.xml
+++ b/integration-tests/jackson/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jaxb/pom.xml b/integration-tests/jaxb/pom.xml
index d9f5f73cdfb16..f13da275ce625 100644
--- a/integration-tests/jaxb/pom.xml
+++ b/integration-tests/jaxb/pom.xml
@@ -25,7 +25,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jaxp/pom.xml b/integration-tests/jaxp/pom.xml
index 360e4760f95d6..c8f80bf7edabb 100644
--- a/integration-tests/jaxp/pom.xml
+++ b/integration-tests/jaxp/pom.xml
@@ -25,7 +25,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jfr-blocking/pom.xml b/integration-tests/jfr-blocking/pom.xml
index e03928ff2b081..a08a240742c2d 100644
--- a/integration-tests/jfr-blocking/pom.xml
+++ b/integration-tests/jfr-blocking/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jfr-opentelemetry/pom.xml b/integration-tests/jfr-opentelemetry/pom.xml
index bf77489f5e04b..7e7439c222e5a 100644
--- a/integration-tests/jfr-opentelemetry/pom.xml
+++ b/integration-tests/jfr-opentelemetry/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jfr-reactive/pom.xml b/integration-tests/jfr-reactive/pom.xml
index 05a39428fac58..eb47af71f83d8 100644
--- a/integration-tests/jfr-reactive/pom.xml
+++ b/integration-tests/jfr-reactive/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-db2/pom.xml b/integration-tests/jpa-db2/pom.xml
index 1b7ed8c202589..528638642f57d 100644
--- a/integration-tests/jpa-db2/pom.xml
+++ b/integration-tests/jpa-db2/pom.xml
@@ -29,12 +29,12 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-h2-embedded/pom.xml b/integration-tests/jpa-h2-embedded/pom.xml
index 47ee00d3d5c93..d2f65b6492fd1 100644
--- a/integration-tests/jpa-h2-embedded/pom.xml
+++ b/integration-tests/jpa-h2-embedded/pom.xml
@@ -32,12 +32,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-h2/pom.xml b/integration-tests/jpa-h2/pom.xml
index 072c2ca1c2b37..32b91c00d7754 100644
--- a/integration-tests/jpa-h2/pom.xml
+++ b/integration-tests/jpa-h2/pom.xml
@@ -37,12 +37,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-mapping-xml/legacy-app/pom.xml b/integration-tests/jpa-mapping-xml/legacy-app/pom.xml
index 0e8320c5a694b..8b9d6ad27ca24 100644
--- a/integration-tests/jpa-mapping-xml/legacy-app/pom.xml
+++ b/integration-tests/jpa-mapping-xml/legacy-app/pom.xml
@@ -45,7 +45,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/jpa-mapping-xml/modern-app/pom.xml b/integration-tests/jpa-mapping-xml/modern-app/pom.xml
index c5d1aa200a03a..b501a43be41e0 100644
--- a/integration-tests/jpa-mapping-xml/modern-app/pom.xml
+++ b/integration-tests/jpa-mapping-xml/modern-app/pom.xml
@@ -46,7 +46,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/jpa-mariadb/pom.xml b/integration-tests/jpa-mariadb/pom.xml
index 02aaa57adc1e4..e8d6ff5d10a62 100644
--- a/integration-tests/jpa-mariadb/pom.xml
+++ b/integration-tests/jpa-mariadb/pom.xml
@@ -34,12 +34,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-mssql/pom.xml b/integration-tests/jpa-mssql/pom.xml
index 93980ab985759..ff66d6019a76b 100644
--- a/integration-tests/jpa-mssql/pom.xml
+++ b/integration-tests/jpa-mssql/pom.xml
@@ -33,12 +33,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-mysql/pom.xml b/integration-tests/jpa-mysql/pom.xml
index 2e31d5d98579b..c7dcfe089393c 100644
--- a/integration-tests/jpa-mysql/pom.xml
+++ b/integration-tests/jpa-mysql/pom.xml
@@ -30,12 +30,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-oracle/pom.xml b/integration-tests/jpa-oracle/pom.xml
index c191f75d451c3..03b6398483da6 100644
--- a/integration-tests/jpa-oracle/pom.xml
+++ b/integration-tests/jpa-oracle/pom.xml
@@ -41,12 +41,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-postgresql-withxml/pom.xml b/integration-tests/jpa-postgresql-withxml/pom.xml
index b04d05c2909ab..bf6a442e5b5d8 100644
--- a/integration-tests/jpa-postgresql-withxml/pom.xml
+++ b/integration-tests/jpa-postgresql-withxml/pom.xml
@@ -34,7 +34,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-postgresql/pom.xml b/integration-tests/jpa-postgresql/pom.xml
index 75230114537dd..da765dc1238ec 100644
--- a/integration-tests/jpa-postgresql/pom.xml
+++ b/integration-tests/jpa-postgresql/pom.xml
@@ -34,12 +34,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa-without-entity/pom.xml b/integration-tests/jpa-without-entity/pom.xml
index b46ab80064e4d..f61ec3bfdaef0 100644
--- a/integration-tests/jpa-without-entity/pom.xml
+++ b/integration-tests/jpa-without-entity/pom.xml
@@ -38,7 +38,7 @@
         <!-- All other test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/jpa/pom.xml b/integration-tests/jpa/pom.xml
index 097bdc5a9fc3b..e4252208b330c 100644
--- a/integration-tests/jpa/pom.xml
+++ b/integration-tests/jpa/pom.xml
@@ -34,7 +34,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/jsonb/pom.xml b/integration-tests/jsonb/pom.xml
index 7e708c0b00952..a28f1ea4407f7 100644
--- a/integration-tests/jsonb/pom.xml
+++ b/integration-tests/jsonb/pom.xml
@@ -26,7 +26,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-avro-apicurio2/pom.xml b/integration-tests/kafka-avro-apicurio2/pom.xml
index 19398b353f8ba..aa7dac13ebd71 100644
--- a/integration-tests/kafka-avro-apicurio2/pom.xml
+++ b/integration-tests/kafka-avro-apicurio2/pom.xml
@@ -82,7 +82,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-devservices/pom.xml b/integration-tests/kafka-devservices/pom.xml
index d9aebdb2e9c4b..792c1abf52780 100644
--- a/integration-tests/kafka-devservices/pom.xml
+++ b/integration-tests/kafka-devservices/pom.xml
@@ -54,12 +54,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-json-schema-apicurio2/pom.xml b/integration-tests/kafka-json-schema-apicurio2/pom.xml
index f336c451d99e7..281a223b8f34c 100644
--- a/integration-tests/kafka-json-schema-apicurio2/pom.xml
+++ b/integration-tests/kafka-json-schema-apicurio2/pom.xml
@@ -77,7 +77,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-oauth-keycloak/pom.xml b/integration-tests/kafka-oauth-keycloak/pom.xml
index 43f19d3917acf..568b72e0c0974 100644
--- a/integration-tests/kafka-oauth-keycloak/pom.xml
+++ b/integration-tests/kafka-oauth-keycloak/pom.xml
@@ -48,7 +48,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-sasl-elytron/pom.xml b/integration-tests/kafka-sasl-elytron/pom.xml
index 0aa1c18ec473b..933fa3a326a1c 100644
--- a/integration-tests/kafka-sasl-elytron/pom.xml
+++ b/integration-tests/kafka-sasl-elytron/pom.xml
@@ -49,7 +49,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-sasl/pom.xml b/integration-tests/kafka-sasl/pom.xml
index a9e30a9cc032b..586eeb70b3e6d 100644
--- a/integration-tests/kafka-sasl/pom.xml
+++ b/integration-tests/kafka-sasl/pom.xml
@@ -54,7 +54,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-snappy/pom.xml b/integration-tests/kafka-snappy/pom.xml
index 7baed5470f0a4..b017cfe006d19 100644
--- a/integration-tests/kafka-snappy/pom.xml
+++ b/integration-tests/kafka-snappy/pom.xml
@@ -64,7 +64,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-ssl/pom.xml b/integration-tests/kafka-ssl/pom.xml
index 05c78f2330779..3016593595923 100644
--- a/integration-tests/kafka-ssl/pom.xml
+++ b/integration-tests/kafka-ssl/pom.xml
@@ -54,7 +54,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka-streams/pom.xml b/integration-tests/kafka-streams/pom.xml
index 6cbaf4b71b8f6..ffa71e33640f6 100644
--- a/integration-tests/kafka-streams/pom.xml
+++ b/integration-tests/kafka-streams/pom.xml
@@ -54,7 +54,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kafka/pom.xml b/integration-tests/kafka/pom.xml
index 1de5683cca54b..110f03297af4e 100644
--- a/integration-tests/kafka/pom.xml
+++ b/integration-tests/kafka/pom.xml
@@ -64,7 +64,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/keycloak-authorization/pom.xml b/integration-tests/keycloak-authorization/pom.xml
index 81072b3593b76..68c1e88e76bc7 100644
--- a/integration-tests/keycloak-authorization/pom.xml
+++ b/integration-tests/keycloak-authorization/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/classic-kotlin/pom.xml b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/classic-kotlin/pom.xml
index 48df305cb1a8f..725dc9f57b0ec 100644
--- a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/classic-kotlin/pom.xml
+++ b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/classic-kotlin/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/kotlin-compiler-args/pom.xml b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/kotlin-compiler-args/pom.xml
index 4ecdc8df91ce4..57d94d6142bc5 100644
--- a/integration-tests/kotlin-maven-invoker/src/test/resources/projects/kotlin-compiler-args/pom.xml
+++ b/integration-tests/kotlin-maven-invoker/src/test/resources/projects/kotlin-compiler-args/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kotlin/pom.xml b/integration-tests/kotlin/pom.xml
index 1b06edc08ed3d..65826e0bd467b 100644
--- a/integration-tests/kotlin/pom.xml
+++ b/integration-tests/kotlin/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kubernetes-client-devservices/pom.xml b/integration-tests/kubernetes-client-devservices/pom.xml
index d78c7c04966d5..d6425567f782b 100644
--- a/integration-tests/kubernetes-client-devservices/pom.xml
+++ b/integration-tests/kubernetes-client-devservices/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
diff --git a/integration-tests/kubernetes-client/pom.xml b/integration-tests/kubernetes-client/pom.xml
index b6544bb95c4ae..79ffe7a74c8a6 100644
--- a/integration-tests/kubernetes-client/pom.xml
+++ b/integration-tests/kubernetes-client/pom.xml
@@ -51,12 +51,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kubernetes-service-binding-jdbc/pom.xml b/integration-tests/kubernetes-service-binding-jdbc/pom.xml
index 0b80b18aa192f..cf438aafb6f1e 100644
--- a/integration-tests/kubernetes-service-binding-jdbc/pom.xml
+++ b/integration-tests/kubernetes-service-binding-jdbc/pom.xml
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kubernetes-service-binding-reactive/pom.xml b/integration-tests/kubernetes-service-binding-reactive/pom.xml
index a715dc46915a4..453f878125a7c 100644
--- a/integration-tests/kubernetes-service-binding-reactive/pom.xml
+++ b/integration-tests/kubernetes-service-binding-reactive/pom.xml
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/pom.xml b/integration-tests/kubernetes/maven-invoker-way/pom.xml
index 582156af7b406..498076c0903b9 100644
--- a/integration-tests/kubernetes/maven-invoker-way/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/pom.xml
@@ -203,7 +203,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml
index 013852297dd56..ae75c197fa2b3 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/knative-jib-build-and-deploy/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
index ca1dfa7ee0f0f..17877003ca216 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
index 4886a40f31558..a89d06c74954b 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
index 72fee808ab714..915bfa352a518 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
index 533c3ad5326ad..160655fd610be 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml
index df2dcb9d6b7d6..516154b3559cc 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc-same-server/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml
index 7e0bfb3f2aaa7..2e42d6444db2b 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-grpc/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
index ff89f4dfb1503..e3f2b266ede83 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy-deploymentconfig/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy-deploymentconfig/pom.xml
index 74d9c3ea5dc63..414d81266140d 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy-deploymentconfig/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy-deploymentconfig/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
index 1ed10dd126bf8..f0991a4298376 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
index 5ff15e511abe6..faa1afbb073d2 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml
index 4c0fbcee7c557..5bef18af28dc2 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-with-output-directory-build-and-deploy/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml b/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml
index c9a17e68fa544..35b24a40ef883 100644
--- a/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml
+++ b/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/kubernetes/quarkus-standard-way/pom.xml b/integration-tests/kubernetes/quarkus-standard-way/pom.xml
index aa95bd0ea16d4..0191120752e54 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/pom.xml
+++ b/integration-tests/kubernetes/quarkus-standard-way/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/liquibase-mongodb/pom.xml b/integration-tests/liquibase-mongodb/pom.xml
index 1ac94cf7a9ce6..5842450de850c 100644
--- a/integration-tests/liquibase-mongodb/pom.xml
+++ b/integration-tests/liquibase-mongodb/pom.xml
@@ -30,7 +30,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/liquibase/pom.xml b/integration-tests/liquibase/pom.xml
index 51828d7e90191..df583c975b553 100644
--- a/integration-tests/liquibase/pom.xml
+++ b/integration-tests/liquibase/pom.xml
@@ -37,12 +37,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/locales/all/pom.xml b/integration-tests/locales/all/pom.xml
index 23a78397426ad..45d04179154b7 100644
--- a/integration-tests/locales/all/pom.xml
+++ b/integration-tests/locales/all/pom.xml
@@ -28,7 +28,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/locales/default/pom.xml b/integration-tests/locales/default/pom.xml
index 2d635a1715b6b..27539dc0c396b 100644
--- a/integration-tests/locales/default/pom.xml
+++ b/integration-tests/locales/default/pom.xml
@@ -28,7 +28,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/locales/some/pom.xml b/integration-tests/locales/some/pom.xml
index f67c85eebff52..e00d205e703c7 100644
--- a/integration-tests/locales/some/pom.xml
+++ b/integration-tests/locales/some/pom.xml
@@ -28,7 +28,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml
index 3d30b51f98f98..1b92a09d38eba 100644
--- a/integration-tests/logging-gelf/pom.xml
+++ b/integration-tests/logging-gelf/pom.xml
@@ -26,7 +26,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/logging-json/pom.xml b/integration-tests/logging-json/pom.xml
index b47b9583a4d70..d47ce9ac8974c 100644
--- a/integration-tests/logging-json/pom.xml
+++ b/integration-tests/logging-json/pom.xml
@@ -31,7 +31,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/logging-min-level-set/pom.xml b/integration-tests/logging-min-level-set/pom.xml
index 38e124a93d652..d77d245c6a5fb 100644
--- a/integration-tests/logging-min-level-set/pom.xml
+++ b/integration-tests/logging-min-level-set/pom.xml
@@ -23,7 +23,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/logging-min-level-unset/pom.xml b/integration-tests/logging-min-level-unset/pom.xml
index 8fed5dc28f7a8..e8bd0502da8f6 100644
--- a/integration-tests/logging-min-level-unset/pom.xml
+++ b/integration-tests/logging-min-level-unset/pom.xml
@@ -23,7 +23,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/logging-panache-kotlin/pom.xml b/integration-tests/logging-panache-kotlin/pom.xml
index 366fccc401d49..9a0fd4a373eff 100644
--- a/integration-tests/logging-panache-kotlin/pom.xml
+++ b/integration-tests/logging-panache-kotlin/pom.xml
@@ -32,7 +32,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/logging-panache/pom.xml b/integration-tests/logging-panache/pom.xml
index 8dd1c543b970e..a45393ba57493 100644
--- a/integration-tests/logging-panache/pom.xml
+++ b/integration-tests/logging-panache/pom.xml
@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/mailer/pom.xml b/integration-tests/mailer/pom.xml
index 47f3e76d5758e..1bbdbc0e94744 100644
--- a/integration-tests/mailer/pom.xml
+++ b/integration-tests/mailer/pom.xml
@@ -36,7 +36,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml
index da293a8fa667f..2a8df9493f42b 100644
--- a/integration-tests/main/pom.xml
+++ b/integration-tests/main/pom.xml
@@ -154,12 +154,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-component</artifactId>
+            <artifactId>quarkus-junit-component</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JUnit5PerClassLifecycleTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JUnit5PerClassLifecycleTest.java
index 22a1a374133ea..50b5a8c40eab8 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/JUnit5PerClassLifecycleTest.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JUnit5PerClassLifecycleTest.java
@@ -15,7 +15,7 @@
 import io.smallrye.common.constraint.Assert;
 
 /**
- * Tests JUnit 5 extension when test lifecycle is PER_CLASS. This means extension events get fired in slightly different
+ * Tests JUnit extension when test lifecycle is PER_CLASS. This means extension events get fired in slightly different
  * order and Quarkus/Arc bootstrap and instance injection have to account for that.
  *
  * Test verifies that bootstrap works and that you can use injection even in before/after methods.
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedITCase.java
index baade0b3d871e..518a81fd2c55e 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedITCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedITCase.java
@@ -76,9 +76,9 @@ void beforeEach() {
         @Order(1)
         void testOne() {
             assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
-            assertEquals(7, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
-            assertEquals(2, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
-            assertEquals(5, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(3, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(1, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(1, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
             assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
         }
 
@@ -86,9 +86,9 @@ void testOne() {
         @Order(2)
         void testTwo() {
             assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
-            assertEquals(9, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
-            assertEquals(3, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
-            assertEquals(7, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(5, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(2, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(3, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
             assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
         }
 
@@ -170,9 +170,9 @@ void beforeEach() {
         @Test
         void testOne() {
             assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
-            assertEquals(3, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
-            assertEquals(1, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
-            assertEquals(1, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(21, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(3, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(19, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
             assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
         }
 
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java
index 479600280ca33..2cda35d2c8abc 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java
@@ -78,9 +78,9 @@ void beforeEach() {
         @Order(1)
         void testOne() {
             assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
-            assertEquals(7, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
-            assertEquals(2, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
-            assertEquals(5, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(3, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(1, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(1, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
             assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
         }
 
@@ -88,9 +88,9 @@ void testOne() {
         @Order(2)
         void testTwo() {
             assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
-            assertEquals(9, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
-            assertEquals(3, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
-            assertEquals(7, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(5, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(2, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(3, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
             assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
         }
 
@@ -162,7 +162,7 @@ void testOuterInstancesInAfterEach() {
             @Test
             @Order(5)
             void testOuterInstancesInAfterAll() {
-                assertEquals(1, TestContextCheckerAfterAllCallback.OUTER_INSTANCES.size());
+                assertEquals(0, TestContextCheckerAfterAllCallback.OUTER_INSTANCES.size());
             }
         }
     }
@@ -178,9 +178,9 @@ void beforeEach() {
         @Test
         void testOne() {
             assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
-            assertEquals(3, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
-            assertEquals(1, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
-            assertEquals(1, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(23, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(3, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(21, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
             assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
         }
 
diff --git a/integration-tests/management-interface-auth/pom.xml b/integration-tests/management-interface-auth/pom.xml
index fc2912e35a062..69e7b4ccdef9f 100644
--- a/integration-tests/management-interface-auth/pom.xml
+++ b/integration-tests/management-interface-auth/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/management-interface/pom.xml b/integration-tests/management-interface/pom.xml
index 9e4c429797d25..3b162a4c0555f 100644
--- a/integration-tests/management-interface/pom.xml
+++ b/integration-tests/management-interface/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
        <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/pom.xml b/integration-tests/maven/pom.xml
index 8b3f3cba926f5..d5d4c6252e302 100644
--- a/integration-tests/maven/pom.xml
+++ b/integration-tests/maven/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -77,7 +77,7 @@
         <!-- Dependencies added to make sure the tests are run by GIB --> 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml
index 760dec2011610..a3b0ca000cc1a 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/pom.xml
index f9089bb6e404f..51d7a3135bd44 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/pom.xml
@@ -28,7 +28,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <version>\${quarkus.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/deployment/pom.xml
index 44ad83bdc9abf..fe93de101e9a5 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/itest/deployment/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml
index fc8416e7e0c5f..dee5f7b76b379 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml
index ef25447202de0..e27608fbfef19 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/deployment/pom.xml
index a445820787d6e..a19955d9f478c 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-current-directory-project/deployment/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/deployment/pom.xml
index a445820787d6e..a19955d9f478c 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project-with-jboss-parent/my-ext/deployment/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/deployment/pom.xml
index a445820787d6e..a19955d9f478c 100644
--- a/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/expected/new-extension-project/my-ext/deployment/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/apt-in-annotation-processor-paths/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/apt-in-annotation-processor-paths/pom.xml
index 5ccf1727b91d3..e63bf8fdbcab6 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/apt-in-annotation-processor-paths/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/apt-in-annotation-processor-paths/pom.xml
@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/apt-in-annotation-processors/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/apt-in-annotation-processors/pom.xml
index 8b8d2d3bf3076..cb335d3acd1a1 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/apt-in-annotation-processors/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/apt-in-annotation-processors/pom.xml
@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/apt-in-classpath/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/apt-in-classpath/pom.xml
index b19864da41e08..0003c2a1596bb 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/apt-in-classpath/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/apt-in-classpath/pom.xml
@@ -65,7 +65,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/runner/pom.xml
index 271a4f256ad7f..413fef11da080 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/runner/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/basic-command-mode/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/basic-command-mode/pom.xml
index 4b15d0284495d..91682b17735c8 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/basic-command-mode/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/basic-command-mode/pom.xml
@@ -34,12 +34,12 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/runner/pom.xml
index bbe7188cf66dd..d6636a2f4673f 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/runner/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/runner/pom.xml
index 57052faa4bfd7..6d68ee80fd9e2 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/runner/pom.xml
@@ -23,7 +23,7 @@
         <!-- missing -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-2.x/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-2.x/pom.xml
index e0a0c674c2618..c8f7c4f953ec3 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-2.x/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-2.x/pom.xml
@@ -55,7 +55,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/pom.xml
index 6a723e9b22fb0..0dfd7a0475907 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/pom.xml
@@ -47,7 +47,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/pom.xml
index 6868d901e8344..c6e6957634cea 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/pom.xml
index 0e485910b223f..30427c270a9b4 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/pom.xml
index 251df3d43a305..90eb065be0bb9 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/pom.xml
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/pom.xml
index 1441eb2f941e4..1e9739a236061 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/pom.xml
index 02cc249e3ea74..a906fef228223 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/pom.xml
index 416f1756da3fe..6bb0dc134ff9f 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/pom.xml
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-resteasy/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-resteasy/pom.xml
index c4640b07ce991..4d4fe276dda62 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-resteasy/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-resteasy/pom.xml
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-with-log/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic-with-log/pom.xml
index 467fac67f4ed0..6e612ccf84cbb 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic-with-log/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-with-log/pom.xml
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/classic/pom.xml
index 467fac67f4ed0..6e612ccf84cbb 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/classic/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/classic/pom.xml
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/acme-codegen/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/acme-codegen/deployment/pom.xml
index 3771122e22315..9825332e9c11f 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/acme-codegen/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/acme-codegen/deployment/pom.xml
@@ -24,7 +24,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/pom.xml
index 3f03d09371d6c..33ee3a2fb4de8 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/pom.xml
@@ -24,7 +24,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/command-mode-app-args-plugin-config/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/command-mode-app-args-plugin-config/pom.xml
index cce802fc99302..cd08437ae9f2a 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/command-mode-app-args-plugin-config/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/command-mode-app-args-plugin-config/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/runner/pom.xml
index 3a723e3fd0089..12e1ab2d612c3 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/runner/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/pom.xml
index c892f03ebbc3f..1bc3ee90fc587 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/pom.xml
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/custom-resources-dir/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/custom-resources-dir/pom.xml
index c13d93412b993..e18f9700eb5ac 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/custom-resources-dir/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/custom-resources-dir/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/pom.xml
index 188bda794e644..52148f02586ab 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/pom.xml
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/pom.xml
index 6942eebebdc40..a6401fd9b9295 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/pom.xml
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/pom.xml
index 0fd506155f939..b1a9d8e5b3b3b 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/pom.xml
index f6c5fcee4b0f1..437c19cf96ef6 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/runner/pom.xml
index 84a6373dc2569..37a8a0a937b1c 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/runner/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/deployment/pom.xml
index 9a2863adf1ba0..c7eca52e12639 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/deployment/pom.xml
@@ -21,7 +21,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/integration-tests/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/integration-tests/pom.xml
index f8ac83bb079c3..8f7ad25b1cc49 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/integration-tests/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/extension-test-with-no-main/integration-tests/pom.xml
@@ -24,7 +24,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/flatten-maven-plugin/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/flatten-maven-plugin/pom.xml
index a9fde9964e5e1..ad285305aca34 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/flatten-maven-plugin/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/flatten-maven-plugin/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/ide-dev-mode-build-props/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/ide-dev-mode-build-props/pom.xml
index aeb84ad4b1356..03a6d8b2bb1a8 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/ide-dev-mode-build-props/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/ide-dev-mode-build-props/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/maven-extension-manipulating-pom/app/app/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/maven-extension-manipulating-pom/app/app/pom.xml
index 40881a79f41c1..5b8272beea9fe 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/maven-extension-manipulating-pom/app/app/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/maven-extension-manipulating-pom/app/app/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/mockito-non-public-inner-class/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/mockito-non-public-inner-class/pom.xml
index fbe2012be6825..2458c162f9886 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/mockito-non-public-inner-class/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/mockito-non-public-inner-class/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-mockito</artifactId>
+      <artifactId>quarkus-junit-mockito</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/integration-tests/rest-tests/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/integration-tests/rest-tests/pom.xml
index c76dc44ac166c..22674c462616b 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/integration-tests/rest-tests/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/integration-tests/rest-tests/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml
index 71c2a810cf64d..afe0990e8e03b 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml
index 8aea7e7053f12..b455aa5a4c25c 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/runner/pom.xml
index 24d797080cb13..86f1c0ae0b956 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/runner/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/runner/pom.xml
index 02fc7c1410081..b175613714c7a 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/runner/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-pom-reference/rest/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-pom-reference/rest/pom.xml
index 1bbdc5ac0ec86..695ce0b55c1dc 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-pom-reference/rest/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-pom-reference/rest/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-pom-reference/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-pom-reference/runner/pom.xml
index e838cbe7d15de..1a84375c64d07 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-pom-reference/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-pom-reference/runner/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/runner/pom.xml
index ccc79c6c94555..34c5d122cf68e 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/runner/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/pom.xml
index 72ab8a74ef5a4..84e91a32caa40 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/runner/pom.xml
index 0b8825d01d5b2..068c54a803417 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/runner/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/pom.xml
index 1bbdc5ac0ec86..695ce0b55c1dc 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/runner/pom.xml
index e838cbe7d15de..1a84375c64d07 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/runner/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/native-agent-integration/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/native-agent-integration/pom.xml
index 5e79b5015cd8a..3d6338c54bbda 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/native-agent-integration/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/native-agent-integration/pom.xml
@@ -55,7 +55,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/path-filter-not-applied-test-classes/app/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/path-filter-not-applied-test-classes/app/pom.xml
index 36e35e17c8bc7..96f05923a223b 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/path-filter-not-applied-test-classes/app/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/path-filter-not-applied-test-classes/app/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/app/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/app/pom.xml
index 03eb02b7bb125..159e0cdf66553 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/app/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/app/pom.xml
@@ -20,7 +20,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/ext/deployment/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/ext/deployment/pom.xml
index fde39025600ff..d98ba3b9faca1 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/ext/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/ext/deployment/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/pom.xml
index 06c65ffacfcce..78eaf8c7f8287 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/pom.xml
@@ -37,7 +37,7 @@
         end comment -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/pom.xml
index 21f37d609612f..3be438e9b2f2c 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/pom.xml
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/runner/pom.xml
index 275cc225c81c2..c57179303dde3 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/runner/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/pom.xml
index 980dce8315e67..bd4d50aad0d2c 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies-groupid/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies-groupid/runner/pom.xml
index dd194e17d311f..bb27f59aeb393 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies-groupid/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies-groupid/runner/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/pom.xml
index dd194e17d311f..bb27f59aeb393 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml
index b5b72691f414e..050e335e1585b 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml
@@ -36,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkustest-added-with-serviceloader/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/quarkustest-added-with-serviceloader/runner/pom.xml
index 7a200cdf0ebdc..bd8ff5dffe6eb 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/quarkustest-added-with-serviceloader/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkustest-added-with-serviceloader/runner/pom.xml
@@ -47,7 +47,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml
index c499c0b96458d..ec9b0ae40236c 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/pom.xml
index 973182ca31c48..2b9b1361d8544 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/pom.xml
index 4ce7da75dfc8d..b760c40bbee4f 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/pom.xml
@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-config-in-test-profile/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-config-in-test-profile/pom.xml
index 919803fa4d820..4dcf6a3d21a4b 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-config-in-test-profile/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-config-in-test-profile/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-flaky-test-multiple-profiles/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-flaky-test-multiple-profiles/pom.xml
index c971e9c0df58a..ee644768ce0f8 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-flaky-test-multiple-profiles/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-flaky-test-multiple-profiles/pom.xml
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-flaky-test-single-profile/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-flaky-test-single-profile/pom.xml
index c971e9c0df58a..ee644768ce0f8 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-flaky-test-single-profile/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-flaky-test-single-profile/pom.xml
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/app/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/app/pom.xml
index 821585b7ffc87..829bfec00d11b 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/app/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/app/pom.xml
@@ -24,7 +24,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-nested-tests-mixed-with-normal-tests/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-nested-tests-mixed-with-normal-tests/pom.xml
index af5d6315bf22a..e364ac20865be 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-nested-tests-mixed-with-normal-tests/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-nested-tests-mixed-with-normal-tests/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/runner/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/runner/pom.xml
index 3a52ff2411f59..4d362c7736ab7 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/runner/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-selection/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-selection/pom.xml
index 4cb346fd1160d..c987da28c5684 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-selection/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-selection/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml
index 00618d461f23e..3fb4f66326747 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml
@@ -59,7 +59,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-template/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-template/pom.xml
index 6eb04200c045f..fe60ea35c3e1d 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-template/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-template/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-test-conditions/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-test-conditions/pom.xml
index dcb15ba3c9e69..89ad121362f11 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-test-conditions/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-test-conditions/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-test-profile-run-main/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-test-profile-run-main/pom.xml
index af5d6315bf22a..e364ac20865be 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-test-profile-run-main/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-test-profile-run-main/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-test-profile/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-test-profile/pom.xml
index af5d6315bf22a..e364ac20865be 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-test-profile/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-test-profile/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-tests-in-project-with-junit-properties-file/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-tests-in-project-with-junit-properties-file/pom.xml
index af5d6315bf22a..e364ac20865be 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-tests-in-project-with-junit-properties-file/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-tests-in-project-with-junit-properties-file/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-third-party-junit-extension/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-third-party-junit-extension/pom.xml
index d716797246184..c8e5cb59f138d 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-third-party-junit-extension/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-third-party-junit-extension/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Dependency which uses a service loader to do stuff -->
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/tests-in-jar-packager/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/tests-in-jar-packager/pom.xml
index dcfcef1a508ca..6e496482f1856 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/tests-in-jar-packager/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/tests-in-jar-packager/pom.xml
@@ -37,7 +37,7 @@
         <!-- insert test dependencies here -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/tests-in-jar/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/tests-in-jar/pom.xml
index 898f61118b498..08d94ef520063 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/tests-in-jar/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/tests-in-jar/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/pom.xml
index a0254579c9083..d57e63e243c86 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/pom.xml
index 2fc49a440c8cd..1eaea269ad47a 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_integration-tests_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_integration-tests_pom.xml
index 78258dde5d646..bb96a8a51cf50 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_integration-tests_pom.xml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_integration-tests_pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/micrometer-mp-metrics/pom.xml b/integration-tests/micrometer-mp-metrics/pom.xml
index 911cac93f4a12..9e044cbaec6ff 100644
--- a/integration-tests/micrometer-mp-metrics/pom.xml
+++ b/integration-tests/micrometer-mp-metrics/pom.xml
@@ -37,7 +37,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/micrometer-opentelemetry/pom.xml b/integration-tests/micrometer-opentelemetry/pom.xml
index 3024e8ce425d0..1c3e701733608 100644
--- a/integration-tests/micrometer-opentelemetry/pom.xml
+++ b/integration-tests/micrometer-opentelemetry/pom.xml
@@ -34,7 +34,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/micrometer-prometheus/pom.xml b/integration-tests/micrometer-prometheus/pom.xml
index 2ab7282b1847e..efd0e0e24afa4 100644
--- a/integration-tests/micrometer-prometheus/pom.xml
+++ b/integration-tests/micrometer-prometheus/pom.xml
@@ -60,7 +60,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/micrometer-security/pom.xml b/integration-tests/micrometer-security/pom.xml
index 9422bf687a856..29f07e2b32e58 100644
--- a/integration-tests/micrometer-security/pom.xml
+++ b/integration-tests/micrometer-security/pom.xml
@@ -34,7 +34,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/mongodb-client/pom.xml b/integration-tests/mongodb-client/pom.xml
index 7bd4783c01fec..cd15effb65430 100644
--- a/integration-tests/mongodb-client/pom.xml
+++ b/integration-tests/mongodb-client/pom.xml
@@ -31,7 +31,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/mongodb-devservices/pom.xml b/integration-tests/mongodb-devservices/pom.xml
index c9a31befc98ef..bdac28d9359a2 100644
--- a/integration-tests/mongodb-devservices/pom.xml
+++ b/integration-tests/mongodb-devservices/pom.xml
@@ -31,7 +31,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/mongodb-panache-kotlin/pom.xml b/integration-tests/mongodb-panache-kotlin/pom.xml
index b20f9108dc75c..b4db3d1a6cfa8 100644
--- a/integration-tests/mongodb-panache-kotlin/pom.xml
+++ b/integration-tests/mongodb-panache-kotlin/pom.xml
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/mongodb-panache/pom.xml b/integration-tests/mongodb-panache/pom.xml
index ef75ce6534d53..2fcc6ce306ce5 100644
--- a/integration-tests/mongodb-panache/pom.xml
+++ b/integration-tests/mongodb-panache/pom.xml
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/mongodb-rest-data-panache/pom.xml b/integration-tests/mongodb-rest-data-panache/pom.xml
index a8aa6fb4e1f59..b1cd4d1e75bd9 100644
--- a/integration-tests/mongodb-rest-data-panache/pom.xml
+++ b/integration-tests/mongodb-rest-data-panache/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/mtls-certificates/pom.xml b/integration-tests/mtls-certificates/pom.xml
index 5209a355df098..6087b8c73094d 100644
--- a/integration-tests/mtls-certificates/pom.xml
+++ b/integration-tests/mtls-certificates/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/mutiny-native-jctools/pom.xml b/integration-tests/mutiny-native-jctools/pom.xml
index 63745714cff8d..59395dad2906f 100644
--- a/integration-tests/mutiny-native-jctools/pom.xml
+++ b/integration-tests/mutiny-native-jctools/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/narayana-jta/pom.xml b/integration-tests/narayana-jta/pom.xml
index 3138ba3c0642b..bca4a43492629 100644
--- a/integration-tests/narayana-jta/pom.xml
+++ b/integration-tests/narayana-jta/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/narayana-lra/pom.xml b/integration-tests/narayana-lra/pom.xml
index 5c13887edf3a9..cf561de236770 100644
--- a/integration-tests/narayana-lra/pom.xml
+++ b/integration-tests/narayana-lra/pom.xml
@@ -31,7 +31,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/narayana-stm/pom.xml b/integration-tests/narayana-stm/pom.xml
index 9a6a817fa2b2e..df67da9887927 100644
--- a/integration-tests/narayana-stm/pom.xml
+++ b/integration-tests/narayana-stm/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/native-config-profile/pom.xml b/integration-tests/native-config-profile/pom.xml
index 4bc0894574d9f..6fcd19793199c 100644
--- a/integration-tests/native-config-profile/pom.xml
+++ b/integration-tests/native-config-profile/pom.xml
@@ -27,7 +27,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/native-image-annotations/pom.xml b/integration-tests/native-image-annotations/pom.xml
index 0476bc4468ca7..b3268f6617fe0 100644
--- a/integration-tests/native-image-annotations/pom.xml
+++ b/integration-tests/native-image-annotations/pom.xml
@@ -27,7 +27,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/no-awt/pom.xml b/integration-tests/no-awt/pom.xml
index 7b8b1a3b46f22..aa68a685fc375 100644
--- a/integration-tests/no-awt/pom.xml
+++ b/integration-tests/no-awt/pom.xml
@@ -23,7 +23,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/observability-lgtm-fixedports/pom.xml b/integration-tests/observability-lgtm-fixedports/pom.xml
index ff2c70bb3a029..79cc5496a1493 100644
--- a/integration-tests/observability-lgtm-fixedports/pom.xml
+++ b/integration-tests/observability-lgtm-fixedports/pom.xml
@@ -33,12 +33,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/observability-lgtm-prometheus/pom.xml b/integration-tests/observability-lgtm-prometheus/pom.xml
index c424451aa2ffd..921d6b728a3ef 100644
--- a/integration-tests/observability-lgtm-prometheus/pom.xml
+++ b/integration-tests/observability-lgtm-prometheus/pom.xml
@@ -37,12 +37,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/observability-lgtm/pom.xml b/integration-tests/observability-lgtm/pom.xml
index d9dc7ae4b7ead..b699e98b36602 100644
--- a/integration-tests/observability-lgtm/pom.xml
+++ b/integration-tests/observability-lgtm/pom.xml
@@ -33,12 +33,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-client-reactive/pom.xml b/integration-tests/oidc-client-reactive/pom.xml
index caab893e3c940..b0847815c8b3f 100644
--- a/integration-tests/oidc-client-reactive/pom.xml
+++ b/integration-tests/oidc-client-reactive/pom.xml
@@ -26,7 +26,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-client-registration/pom.xml b/integration-tests/oidc-client-registration/pom.xml
index 1c064689bcba6..5d1831ae1e518 100644
--- a/integration-tests/oidc-client-registration/pom.xml
+++ b/integration-tests/oidc-client-registration/pom.xml
@@ -74,7 +74,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-client-wiremock/pom.xml b/integration-tests/oidc-client-wiremock/pom.xml
index 668b25ec8b233..03f1dfd1ace67 100644
--- a/integration-tests/oidc-client-wiremock/pom.xml
+++ b/integration-tests/oidc-client-wiremock/pom.xml
@@ -18,7 +18,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-client/pom.xml b/integration-tests/oidc-client/pom.xml
index 2987d69959012..c5f98c0fc2f3a 100644
--- a/integration-tests/oidc-client/pom.xml
+++ b/integration-tests/oidc-client/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-code-flow/pom.xml b/integration-tests/oidc-code-flow/pom.xml
index 93d59874efedf..6c5ad34bedde2 100644
--- a/integration-tests/oidc-code-flow/pom.xml
+++ b/integration-tests/oidc-code-flow/pom.xml
@@ -47,7 +47,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-dev-services/pom.xml b/integration-tests/oidc-dev-services/pom.xml
index b23769f527986..0f4c00a18d45e 100644
--- a/integration-tests/oidc-dev-services/pom.xml
+++ b/integration-tests/oidc-dev-services/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-dpop/pom.xml b/integration-tests/oidc-dpop/pom.xml
index 86825fb430f3d..d504f2e5c99b3 100644
--- a/integration-tests/oidc-dpop/pom.xml
+++ b/integration-tests/oidc-dpop/pom.xml
@@ -69,7 +69,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-mtls/pom.xml b/integration-tests/oidc-mtls/pom.xml
index 7b6b331e319be..054ba7e7c29bc 100644
--- a/integration-tests/oidc-mtls/pom.xml
+++ b/integration-tests/oidc-mtls/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-tenancy/pom.xml b/integration-tests/oidc-tenancy/pom.xml
index e62e1bea953cb..ccfe08847866c 100644
--- a/integration-tests/oidc-tenancy/pom.xml
+++ b/integration-tests/oidc-tenancy/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-token-propagation-reactive/pom.xml b/integration-tests/oidc-token-propagation-reactive/pom.xml
index 47b8de765c8a3..1c9f4f3db89d0 100644
--- a/integration-tests/oidc-token-propagation-reactive/pom.xml
+++ b/integration-tests/oidc-token-propagation-reactive/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-wiremock-logout/pom.xml b/integration-tests/oidc-wiremock-logout/pom.xml
index 546a318c317c7..31c826e185375 100644
--- a/integration-tests/oidc-wiremock-logout/pom.xml
+++ b/integration-tests/oidc-wiremock-logout/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-wiremock-providers/pom.xml b/integration-tests/oidc-wiremock-providers/pom.xml
index 25f98f412045c..10106be3bce75 100644
--- a/integration-tests/oidc-wiremock-providers/pom.xml
+++ b/integration-tests/oidc-wiremock-providers/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc-wiremock/pom.xml b/integration-tests/oidc-wiremock/pom.xml
index bc89fbb757485..2a3d1ffc72493 100644
--- a/integration-tests/oidc-wiremock/pom.xml
+++ b/integration-tests/oidc-wiremock/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/oidc/pom.xml b/integration-tests/oidc/pom.xml
index b780923872b34..e4b2c9201cfa3 100644
--- a/integration-tests/oidc/pom.xml
+++ b/integration-tests/oidc/pom.xml
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/openapi/pom.xml b/integration-tests/openapi/pom.xml
index b6ad484e08818..c8b1e4b6bb216 100644
--- a/integration-tests/openapi/pom.xml
+++ b/integration-tests/openapi/pom.xml
@@ -34,12 +34,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-component</artifactId>
+            <artifactId>quarkus-junit-component</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/openshift-client/pom.xml b/integration-tests/openshift-client/pom.xml
index a5bb07ea7c7d1..b4860f79e24e4 100644
--- a/integration-tests/openshift-client/pom.xml
+++ b/integration-tests/openshift-client/pom.xml
@@ -58,12 +58,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-exporter-logging/pom.xml b/integration-tests/opentelemetry-exporter-logging/pom.xml
index a16777018f8f2..0edea7e82d8e3 100644
--- a/integration-tests/opentelemetry-exporter-logging/pom.xml
+++ b/integration-tests/opentelemetry-exporter-logging/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-grpc-only/pom.xml b/integration-tests/opentelemetry-grpc-only/pom.xml
index a5e12b703fb45..a18d7cb327c93 100644
--- a/integration-tests/opentelemetry-grpc-only/pom.xml
+++ b/integration-tests/opentelemetry-grpc-only/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/opentelemetry-grpc/pom.xml b/integration-tests/opentelemetry-grpc/pom.xml
index 6a6bf38f40531..c2ffac89f632c 100644
--- a/integration-tests/opentelemetry-grpc/pom.xml
+++ b/integration-tests/opentelemetry-grpc/pom.xml
@@ -43,7 +43,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/pom.xml b/integration-tests/opentelemetry-jdbc-instrumentation/pom.xml
index 8a2a3b84d3144..e76e3348cce4b 100644
--- a/integration-tests/opentelemetry-jdbc-instrumentation/pom.xml
+++ b/integration-tests/opentelemetry-jdbc-instrumentation/pom.xml
@@ -60,7 +60,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-minimal/pom.xml b/integration-tests/opentelemetry-minimal/pom.xml
index 7dccd1b87b7a5..bd4e1977d7413 100644
--- a/integration-tests/opentelemetry-minimal/pom.xml
+++ b/integration-tests/opentelemetry-minimal/pom.xml
@@ -28,7 +28,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-mongodb-client-instrumentation/pom.xml b/integration-tests/opentelemetry-mongodb-client-instrumentation/pom.xml
index 4e209239015a9..3d7185f8e6b07 100644
--- a/integration-tests/opentelemetry-mongodb-client-instrumentation/pom.xml
+++ b/integration-tests/opentelemetry-mongodb-client-instrumentation/pom.xml
@@ -45,7 +45,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-quartz/pom.xml b/integration-tests/opentelemetry-quartz/pom.xml
index c41ffdd9ad0cf..95e5c4ebd86a8 100644
--- a/integration-tests/opentelemetry-quartz/pom.xml
+++ b/integration-tests/opentelemetry-quartz/pom.xml
@@ -43,7 +43,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-quickstart/pom.xml b/integration-tests/opentelemetry-quickstart/pom.xml
index 6258f7c3e68a4..f2686e7607c63 100644
--- a/integration-tests/opentelemetry-quickstart/pom.xml
+++ b/integration-tests/opentelemetry-quickstart/pom.xml
@@ -41,7 +41,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-reactive-messaging/pom.xml b/integration-tests/opentelemetry-reactive-messaging/pom.xml
index 4f0944fa7b67f..c47b0afd75090 100644
--- a/integration-tests/opentelemetry-reactive-messaging/pom.xml
+++ b/integration-tests/opentelemetry-reactive-messaging/pom.xml
@@ -44,7 +44,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-reactive/pom.xml b/integration-tests/opentelemetry-reactive/pom.xml
index 660dd8da737d1..0f7ce5de9e861 100644
--- a/integration-tests/opentelemetry-reactive/pom.xml
+++ b/integration-tests/opentelemetry-reactive/pom.xml
@@ -50,7 +50,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-redis-instrumentation/pom.xml b/integration-tests/opentelemetry-redis-instrumentation/pom.xml
index 4dd118b520a01..e23c3070c6502 100644
--- a/integration-tests/opentelemetry-redis-instrumentation/pom.xml
+++ b/integration-tests/opentelemetry-redis-instrumentation/pom.xml
@@ -39,7 +39,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-scheduler/pom.xml b/integration-tests/opentelemetry-scheduler/pom.xml
index b49a54c56d6ec..c03813d3b3801 100644
--- a/integration-tests/opentelemetry-scheduler/pom.xml
+++ b/integration-tests/opentelemetry-scheduler/pom.xml
@@ -43,7 +43,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-spi/pom.xml b/integration-tests/opentelemetry-spi/pom.xml
index 8ad73c5b62e01..6a7cf6c0ad34d 100644
--- a/integration-tests/opentelemetry-spi/pom.xml
+++ b/integration-tests/opentelemetry-spi/pom.xml
@@ -50,7 +50,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-vertx-exporter/pom.xml b/integration-tests/opentelemetry-vertx-exporter/pom.xml
index dba211e3ede28..a740861bb6161 100644
--- a/integration-tests/opentelemetry-vertx-exporter/pom.xml
+++ b/integration-tests/opentelemetry-vertx-exporter/pom.xml
@@ -26,7 +26,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry-vertx/pom.xml b/integration-tests/opentelemetry-vertx/pom.xml
index 62da225a990a1..eaf8f83dafac5 100644
--- a/integration-tests/opentelemetry-vertx/pom.xml
+++ b/integration-tests/opentelemetry-vertx/pom.xml
@@ -40,7 +40,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/opentelemetry/pom.xml b/integration-tests/opentelemetry/pom.xml
index b98f31d9c6cb7..9be3f1de4ae94 100644
--- a/integration-tests/opentelemetry/pom.xml
+++ b/integration-tests/opentelemetry/pom.xml
@@ -56,7 +56,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/packaging/pom.xml b/integration-tests/packaging/pom.xml
index 04505adb8f637..660c212ff89aa 100644
--- a/integration-tests/packaging/pom.xml
+++ b/integration-tests/packaging/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/picocli-native/pom.xml b/integration-tests/picocli-native/pom.xml
index 10f04411c601d..797ba3f73ff00 100644
--- a/integration-tests/picocli-native/pom.xml
+++ b/integration-tests/picocli-native/pom.xml
@@ -26,7 +26,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/picocli/pom.xml b/integration-tests/picocli/pom.xml
index 99e5635114578..47fe834f65fbd 100644
--- a/integration-tests/picocli/pom.xml
+++ b/integration-tests/picocli/pom.xml
@@ -21,12 +21,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/quartz-deferred-datasource/pom.xml b/integration-tests/quartz-deferred-datasource/pom.xml
index 09d6a6832b19b..b4dc7e3daa7a6 100644
--- a/integration-tests/quartz-deferred-datasource/pom.xml
+++ b/integration-tests/quartz-deferred-datasource/pom.xml
@@ -45,7 +45,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/quartz/pom.xml b/integration-tests/quartz/pom.xml
index 12d70345a8317..15268bfb110f4 100644
--- a/integration-tests/quartz/pom.xml
+++ b/integration-tests/quartz/pom.xml
@@ -45,7 +45,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/qute/pom.xml b/integration-tests/qute/pom.xml
index 4f9f70242985f..52cad7665efd2 100644
--- a/integration-tests/qute/pom.xml
+++ b/integration-tests/qute/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-db2-client/pom.xml b/integration-tests/reactive-db2-client/pom.xml
index 6f2e4f923ff4b..a2900dd34ada9 100644
--- a/integration-tests/reactive-db2-client/pom.xml
+++ b/integration-tests/reactive-db2-client/pom.xml
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-amqp/pom.xml b/integration-tests/reactive-messaging-amqp/pom.xml
index 918a834bcba0b..0aaeb63d7f571 100644
--- a/integration-tests/reactive-messaging-amqp/pom.xml
+++ b/integration-tests/reactive-messaging-amqp/pom.xml
@@ -42,7 +42,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-context-propagation/pom.xml b/integration-tests/reactive-messaging-context-propagation/pom.xml
index 819aea6ddb74d..1595a28ebd8df 100644
--- a/integration-tests/reactive-messaging-context-propagation/pom.xml
+++ b/integration-tests/reactive-messaging-context-propagation/pom.xml
@@ -71,7 +71,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-hibernate-orm/pom.xml b/integration-tests/reactive-messaging-hibernate-orm/pom.xml
index f5409927470a1..ebe1cee4f0043 100644
--- a/integration-tests/reactive-messaging-hibernate-orm/pom.xml
+++ b/integration-tests/reactive-messaging-hibernate-orm/pom.xml
@@ -72,7 +72,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-hibernate-reactive/pom.xml b/integration-tests/reactive-messaging-hibernate-reactive/pom.xml
index 029a927dce98f..dbfa414844b21 100644
--- a/integration-tests/reactive-messaging-hibernate-reactive/pom.xml
+++ b/integration-tests/reactive-messaging-hibernate-reactive/pom.xml
@@ -72,7 +72,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-kafka/pom.xml b/integration-tests/reactive-messaging-kafka/pom.xml
index 6769574ca1d8c..5a729bd51981e 100644
--- a/integration-tests/reactive-messaging-kafka/pom.xml
+++ b/integration-tests/reactive-messaging-kafka/pom.xml
@@ -71,7 +71,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-mqtt/pom.xml b/integration-tests/reactive-messaging-mqtt/pom.xml
index c23a2b353df1f..d25f90a209ec6 100644
--- a/integration-tests/reactive-messaging-mqtt/pom.xml
+++ b/integration-tests/reactive-messaging-mqtt/pom.xml
@@ -53,7 +53,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-pulsar/pom.xml b/integration-tests/reactive-messaging-pulsar/pom.xml
index 627c503187dad..e9b440bfd0569 100644
--- a/integration-tests/reactive-messaging-pulsar/pom.xml
+++ b/integration-tests/reactive-messaging-pulsar/pom.xml
@@ -73,7 +73,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-rabbitmq-devservices/pom.xml b/integration-tests/reactive-messaging-rabbitmq-devservices/pom.xml
index da4a59ea98093..d72baa544e9c4 100644
--- a/integration-tests/reactive-messaging-rabbitmq-devservices/pom.xml
+++ b/integration-tests/reactive-messaging-rabbitmq-devservices/pom.xml
@@ -53,7 +53,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-rabbitmq-dyn/pom.xml b/integration-tests/reactive-messaging-rabbitmq-dyn/pom.xml
index e46ccf5be0bd5..0985c5d6bd10d 100644
--- a/integration-tests/reactive-messaging-rabbitmq-dyn/pom.xml
+++ b/integration-tests/reactive-messaging-rabbitmq-dyn/pom.xml
@@ -53,7 +53,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-messaging-rabbitmq/pom.xml b/integration-tests/reactive-messaging-rabbitmq/pom.xml
index 802395ed095f6..5d3d8170ad5c5 100644
--- a/integration-tests/reactive-messaging-rabbitmq/pom.xml
+++ b/integration-tests/reactive-messaging-rabbitmq/pom.xml
@@ -53,7 +53,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-mssql-client/pom.xml b/integration-tests/reactive-mssql-client/pom.xml
index 252946fce9816..5f9b2577b8b1d 100644
--- a/integration-tests/reactive-mssql-client/pom.xml
+++ b/integration-tests/reactive-mssql-client/pom.xml
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-mysql-client/pom.xml b/integration-tests/reactive-mysql-client/pom.xml
index f25fd847d1edb..e69e38c090920 100644
--- a/integration-tests/reactive-mysql-client/pom.xml
+++ b/integration-tests/reactive-mysql-client/pom.xml
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-oracle-client/pom.xml b/integration-tests/reactive-oracle-client/pom.xml
index 310f5a6345dc6..e355403a18939 100644
--- a/integration-tests/reactive-oracle-client/pom.xml
+++ b/integration-tests/reactive-oracle-client/pom.xml
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/reactive-pg-client/pom.xml b/integration-tests/reactive-pg-client/pom.xml
index 14e8880b3ba0c..edfdaa66cc6c3 100644
--- a/integration-tests/reactive-pg-client/pom.xml
+++ b/integration-tests/reactive-pg-client/pom.xml
@@ -30,12 +30,12 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/redis-cache/pom.xml b/integration-tests/redis-cache/pom.xml
index 79bb3b2a30163..c3e9adcbd7948 100644
--- a/integration-tests/redis-cache/pom.xml
+++ b/integration-tests/redis-cache/pom.xml
@@ -32,7 +32,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/redis-client/pom.xml b/integration-tests/redis-client/pom.xml
index a323134add967..09de833bcdc30 100644
--- a/integration-tests/redis-client/pom.xml
+++ b/integration-tests/redis-client/pom.xml
@@ -32,7 +32,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/redis-devservices/pom.xml b/integration-tests/redis-devservices/pom.xml
index 5df531435c424..f4a15412f80ac 100644
--- a/integration-tests/redis-devservices/pom.xml
+++ b/integration-tests/redis-devservices/pom.xml
@@ -25,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/rest-client-reactive-http2/pom.xml b/integration-tests/rest-client-reactive-http2/pom.xml
index 22ad4c221a303..e6d7111b8aaf7 100644
--- a/integration-tests/rest-client-reactive-http2/pom.xml
+++ b/integration-tests/rest-client-reactive-http2/pom.xml
@@ -26,7 +26,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -45,7 +45,7 @@
         </dependency>
       <dependency>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-junit5-internal</artifactId>
+        <artifactId>quarkus-junit-internal</artifactId>
         <scope>test</scope>
       </dependency>
 
diff --git a/integration-tests/rest-client-reactive-kotlin-serialization-with-validator/pom.xml b/integration-tests/rest-client-reactive-kotlin-serialization-with-validator/pom.xml
index bb2bf24bc2f16..42bfca97f0b19 100644
--- a/integration-tests/rest-client-reactive-kotlin-serialization-with-validator/pom.xml
+++ b/integration-tests/rest-client-reactive-kotlin-serialization-with-validator/pom.xml
@@ -28,7 +28,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/rest-client-reactive-kotlin-serialization/pom.xml b/integration-tests/rest-client-reactive-kotlin-serialization/pom.xml
index 9e64aae9e61ec..6f72025883ce5 100644
--- a/integration-tests/rest-client-reactive-kotlin-serialization/pom.xml
+++ b/integration-tests/rest-client-reactive-kotlin-serialization/pom.xml
@@ -24,7 +24,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/rest-client-reactive-multipart/pom.xml b/integration-tests/rest-client-reactive-multipart/pom.xml
index 00cce97b48162..46d748977fee6 100644
--- a/integration-tests/rest-client-reactive-multipart/pom.xml
+++ b/integration-tests/rest-client-reactive-multipart/pom.xml
@@ -26,7 +26,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/rest-client-reactive-stork/pom.xml b/integration-tests/rest-client-reactive-stork/pom.xml
index b84cee3058bd2..8ffed7bc2e3d5 100644
--- a/integration-tests/rest-client-reactive-stork/pom.xml
+++ b/integration-tests/rest-client-reactive-stork/pom.xml
@@ -52,7 +52,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/rest-client-reactive/pom.xml b/integration-tests/rest-client-reactive/pom.xml
index e43d651167567..89a48426aa88f 100644
--- a/integration-tests/rest-client-reactive/pom.xml
+++ b/integration-tests/rest-client-reactive/pom.xml
@@ -43,7 +43,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/selfsigned/SelfSignedServiceTestResource.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/selfsigned/SelfSignedServiceTestResource.java
index 2e2a23ba5eb9f..c56caade84785 100644
--- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/selfsigned/SelfSignedServiceTestResource.java
+++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/selfsigned/SelfSignedServiceTestResource.java
@@ -21,7 +21,7 @@ public Map<String, String> start() {
         File file = new File("target/certs");
         file.mkdirs();
         // Generate self-signed certificate
-        // We do not use the junit 5 plugin to avoid having to annotate all the tests to make sure the certs are
+        // We do not use the JUnit plugin to avoid having to annotate all the tests to make sure the certs are
         // generated before the tests are run
         CertificateGenerator generator = new CertificateGenerator(file.toPath(), false);
         CertificateRequest cr = new CertificateRequest()
diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/wronghost/BadHostServiceTestResource.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/wronghost/BadHostServiceTestResource.java
index 163b2f94f4985..8604a080fc203 100644
--- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/wronghost/BadHostServiceTestResource.java
+++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/wronghost/BadHostServiceTestResource.java
@@ -21,7 +21,7 @@ public Map<String, String> start() {
         File file = new File("target/certs");
         file.mkdirs();
         // Generate self-signed certificate
-        // We do not use the junit 5 plugin to avoid having to annotate all the tests to make sure the certs are
+        // We do not use the JUnit plugin to avoid having to annotate all the tests to make sure the certs are
         // generated before the tests are run
         CertificateGenerator generator = new CertificateGenerator(file.toPath(), false);
         CertificateRequest cr = new CertificateRequest()
diff --git a/integration-tests/rest-client/pom.xml b/integration-tests/rest-client/pom.xml
index 20aaf2d16f8d3..865f00dd95914 100644
--- a/integration-tests/rest-client/pom.xml
+++ b/integration-tests/rest-client/pom.xml
@@ -57,7 +57,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/selfsigned/SelfSignedServiceTestResource.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/selfsigned/SelfSignedServiceTestResource.java
index 13011706a2688..f3ca617770588 100644
--- a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/selfsigned/SelfSignedServiceTestResource.java
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/selfsigned/SelfSignedServiceTestResource.java
@@ -26,7 +26,7 @@ public Map<String, String> start() {
         File file = new File("target/certs");
         file.mkdirs();
         // Generate self-signed certificate
-        // We do not use the junit 5 plugin to avoid having to annotate all the tests to make sure the certs are
+        // We do not use the JUnit plugin to avoid having to annotate all the tests to make sure the certs are
         // generated before the tests are run
         CertificateGenerator generator = new CertificateGenerator(file.toPath(), false);
         try {
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/BadHostServiceTestResource.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/BadHostServiceTestResource.java
index 206702bec5eb0..17f8d48183903 100644
--- a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/BadHostServiceTestResource.java
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/BadHostServiceTestResource.java
@@ -21,7 +21,7 @@ public Map<String, String> start() {
         File file = new File("target/certs");
         file.mkdirs();
         // Generate self-signed certificate
-        // We do not use the junit 5 plugin to avoid having to annotate all the tests to make sure the certs are
+        // We do not use the JUnit plugin to avoid having to annotate all the tests to make sure the certs are
         // generated before the tests are run
         CertificateGenerator generator = new CertificateGenerator(file.toPath(), false);
         CertificateRequest cr = new CertificateRequest()
diff --git a/integration-tests/rest-csrf/pom.xml b/integration-tests/rest-csrf/pom.xml
index 772a01b8a30b3..d8b1557806d50 100644
--- a/integration-tests/rest-csrf/pom.xml
+++ b/integration-tests/rest-csrf/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/resteasy-jackson/pom.xml b/integration-tests/resteasy-jackson/pom.xml
index 0db14bab805ea..a0d065d6a6646 100644
--- a/integration-tests/resteasy-jackson/pom.xml
+++ b/integration-tests/resteasy-jackson/pom.xml
@@ -27,7 +27,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/resteasy-mutiny/pom.xml b/integration-tests/resteasy-mutiny/pom.xml
index 0c745ec1106df..51cee2622843e 100644
--- a/integration-tests/resteasy-mutiny/pom.xml
+++ b/integration-tests/resteasy-mutiny/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/resteasy-reactive-kotlin/prod-mode/pom.xml b/integration-tests/resteasy-reactive-kotlin/prod-mode/pom.xml
index 1cede089776d3..2c09a5ed87425 100644
--- a/integration-tests/resteasy-reactive-kotlin/prod-mode/pom.xml
+++ b/integration-tests/resteasy-reactive-kotlin/prod-mode/pom.xml
@@ -29,12 +29,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/resteasy-reactive-kotlin/standard/pom.xml b/integration-tests/resteasy-reactive-kotlin/standard/pom.xml
index d37324da463ac..57ca61d3f83b0 100644
--- a/integration-tests/resteasy-reactive-kotlin/standard/pom.xml
+++ b/integration-tests/resteasy-reactive-kotlin/standard/pom.xml
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
index 4839d506ea307..b94391155053f 100644
--- a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
+++ b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/security-webauthn/pom.xml b/integration-tests/security-webauthn/pom.xml
index da0220a4a95b6..e7df686b3c7fa 100644
--- a/integration-tests/security-webauthn/pom.xml
+++ b/integration-tests/security-webauthn/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/simple with space/pom.xml b/integration-tests/simple with space/pom.xml
index d5a06353e709b..e6cd3d44b7467 100644
--- a/integration-tests/simple with space/pom.xml	
+++ b/integration-tests/simple with space/pom.xml	
@@ -28,7 +28,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/smallrye-config/pom.xml b/integration-tests/smallrye-config/pom.xml
index b3c4e30254ad7..dc6943f459752 100644
--- a/integration-tests/smallrye-config/pom.xml
+++ b/integration-tests/smallrye-config/pom.xml
@@ -56,17 +56,17 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-mockito</artifactId>
+      <artifactId>quarkus-junit-mockito</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/smallrye-context-propagation/pom.xml b/integration-tests/smallrye-context-propagation/pom.xml
index e73c2c6c00c80..d3a289e3e6c3d 100644
--- a/integration-tests/smallrye-context-propagation/pom.xml
+++ b/integration-tests/smallrye-context-propagation/pom.xml
@@ -22,7 +22,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/smallrye-graphql-client-keycloak/pom.xml b/integration-tests/smallrye-graphql-client-keycloak/pom.xml
index e71a8329d7bf5..e39800f2abc75 100644
--- a/integration-tests/smallrye-graphql-client-keycloak/pom.xml
+++ b/integration-tests/smallrye-graphql-client-keycloak/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/smallrye-graphql-client/pom.xml b/integration-tests/smallrye-graphql-client/pom.xml
index 5148f77e899f6..d620ad524964c 100644
--- a/integration-tests/smallrye-graphql-client/pom.xml
+++ b/integration-tests/smallrye-graphql-client/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/smallrye-graphql/pom.xml b/integration-tests/smallrye-graphql/pom.xml
index 2f4e00b926ffe..103d488669ffd 100644
--- a/integration-tests/smallrye-graphql/pom.xml
+++ b/integration-tests/smallrye-graphql/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/smallrye-jwt-oidc-webapp/pom.xml b/integration-tests/smallrye-jwt-oidc-webapp/pom.xml
index 3f25b0aebb88b..9ccacf29ecae1 100644
--- a/integration-tests/smallrye-jwt-oidc-webapp/pom.xml
+++ b/integration-tests/smallrye-jwt-oidc-webapp/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/smallrye-jwt-token-propagation/pom.xml b/integration-tests/smallrye-jwt-token-propagation/pom.xml
index dfb667050b30c..0814513a022c9 100644
--- a/integration-tests/smallrye-jwt-token-propagation/pom.xml
+++ b/integration-tests/smallrye-jwt-token-propagation/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/smallrye-jwt/pom.xml b/integration-tests/smallrye-jwt/pom.xml
index fa1c6126dbf20..9ea84a9765e96 100644
--- a/integration-tests/smallrye-jwt/pom.xml
+++ b/integration-tests/smallrye-jwt/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/smallrye-metrics/pom.xml b/integration-tests/smallrye-metrics/pom.xml
index 501976d466147..7479cb8fbb583 100644
--- a/integration-tests/smallrye-metrics/pom.xml
+++ b/integration-tests/smallrye-metrics/pom.xml
@@ -28,7 +28,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/smallrye-stork-registration/pom.xml b/integration-tests/smallrye-stork-registration/pom.xml
index a352eb1fd1eae..7eb92c63ae682 100644
--- a/integration-tests/smallrye-stork-registration/pom.xml
+++ b/integration-tests/smallrye-stork-registration/pom.xml
@@ -28,7 +28,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/spring-boot-properties/pom.xml b/integration-tests/spring-boot-properties/pom.xml
index 032c4da276691..c035ae72e981c 100644
--- a/integration-tests/spring-boot-properties/pom.xml
+++ b/integration-tests/spring-boot-properties/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/spring-cloud-config-client/pom.xml b/integration-tests/spring-cloud-config-client/pom.xml
index 487775244dd79..691c68094e5dd 100644
--- a/integration-tests/spring-cloud-config-client/pom.xml
+++ b/integration-tests/spring-cloud-config-client/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/spring-data-jpa/pom.xml b/integration-tests/spring-data-jpa/pom.xml
index 7ab4d615e16cf..84c2e2ca0ba46 100644
--- a/integration-tests/spring-data-jpa/pom.xml
+++ b/integration-tests/spring-data-jpa/pom.xml
@@ -33,17 +33,17 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/spring-data-rest/pom.xml b/integration-tests/spring-data-rest/pom.xml
index 84fedea753647..3e9bb9e11ae3a 100644
--- a/integration-tests/spring-data-rest/pom.xml
+++ b/integration-tests/spring-data-rest/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/spring-di/pom.xml b/integration-tests/spring-di/pom.xml
index c55d3a180da0e..8c8c6908225b4 100644
--- a/integration-tests/spring-di/pom.xml
+++ b/integration-tests/spring-di/pom.xml
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/spring-web/pom.xml b/integration-tests/spring-web/pom.xml
index 8a934d01d5b8c..8ed374df9f2ea 100644
--- a/integration-tests/spring-web/pom.xml
+++ b/integration-tests/spring-web/pom.xml
@@ -60,12 +60,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/test-extension/extension-that-defines-junit-test-extensions/deployment/pom.xml b/integration-tests/test-extension/extension-that-defines-junit-test-extensions/deployment/pom.xml
index 7757fd6b1d07d..fb0aeb5aecc12 100644
--- a/integration-tests/test-extension/extension-that-defines-junit-test-extensions/deployment/pom.xml
+++ b/integration-tests/test-extension/extension-that-defines-junit-test-extensions/deployment/pom.xml
@@ -45,12 +45,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/test-extension/extension/deployment/pom.xml b/integration-tests/test-extension/extension/deployment/pom.xml
index 837bac1991ce1..cd62294376260 100644
--- a/integration-tests/test-extension/extension/deployment/pom.xml
+++ b/integration-tests/test-extension/extension/deployment/pom.xml
@@ -50,12 +50,12 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/test-extension/tests/pom.xml b/integration-tests/test-extension/tests/pom.xml
index 11caaf73bdada..f1f181801c0a3 100644
--- a/integration-tests/test-extension/tests/pom.xml
+++ b/integration-tests/test-extension/tests/pom.xml
@@ -26,12 +26,12 @@
     <!-- test dependencies -->
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/avro-multimodule-project/module2/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/avro-multimodule-project/module2/pom.xml
index 9f71a1b82259f..625312f818303 100644
--- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/avro-multimodule-project/module2/pom.xml
+++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/avro-multimodule-project/module2/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml
index 7e5c7dec8c51a..bbf51ed112ee5 100644
--- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml
+++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-callback-from-extension/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml
index abe42112c0a1e..ec340a65bcabc 100644
--- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml
+++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-parameter-injection/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension-with-bytecode-changes/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension-with-bytecode-changes/pom.xml
index 5d835238c2271..ea4d644c70935 100644
--- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension-with-bytecode-changes/pom.xml
+++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension-with-bytecode-changes/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
index 5d835238c2271..ea4d644c70935 100644
--- a/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
+++ b/integration-tests/test-extension/tests/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/integration-tests/vertx-graphql/pom.xml b/integration-tests/vertx-graphql/pom.xml
index f0cec87cf7acf..149ea846cf093 100644
--- a/integration-tests/vertx-graphql/pom.xml
+++ b/integration-tests/vertx-graphql/pom.xml
@@ -22,7 +22,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/vertx-http-compressors/all/pom.xml b/integration-tests/vertx-http-compressors/all/pom.xml
index 2d98e432b5e6e..27b496b0002ad 100644
--- a/integration-tests/vertx-http-compressors/all/pom.xml
+++ b/integration-tests/vertx-http-compressors/all/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/vertx-http-compressors/app/pom.xml b/integration-tests/vertx-http-compressors/app/pom.xml
index aab09d203fb9d..77d5939ef6a73 100644
--- a/integration-tests/vertx-http-compressors/app/pom.xml
+++ b/integration-tests/vertx-http-compressors/app/pom.xml
@@ -18,7 +18,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/vertx-http-compressors/some/pom.xml b/integration-tests/vertx-http-compressors/some/pom.xml
index 33b6515217c51..d651f4ec12a1b 100644
--- a/integration-tests/vertx-http-compressors/some/pom.xml
+++ b/integration-tests/vertx-http-compressors/some/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/integration-tests/vertx-http/pom.xml b/integration-tests/vertx-http/pom.xml
index c78c8565389ee..3f8e8d4d4985f 100644
--- a/integration-tests/vertx-http/pom.xml
+++ b/integration-tests/vertx-http/pom.xml
@@ -29,7 +29,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/vertx-kotlin/pom.xml b/integration-tests/vertx-kotlin/pom.xml
index 14a08e162a825..9d828d7c5225b 100644
--- a/integration-tests/vertx-kotlin/pom.xml
+++ b/integration-tests/vertx-kotlin/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/vertx-web-jackson/pom.xml b/integration-tests/vertx-web-jackson/pom.xml
index 8f317c1327a7c..da03cf06be1f0 100644
--- a/integration-tests/vertx-web-jackson/pom.xml
+++ b/integration-tests/vertx-web-jackson/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/vertx-web/pom.xml b/integration-tests/vertx-web/pom.xml
index 36014f7e5b7f4..95d1555414619 100644
--- a/integration-tests/vertx-web/pom.xml
+++ b/integration-tests/vertx-web/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/vertx/pom.xml b/integration-tests/vertx/pom.xml
index eb0067c19d80d..c75c10520a755 100644
--- a/integration-tests/vertx/pom.xml
+++ b/integration-tests/vertx/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-http-resteasy/pom.xml b/integration-tests/virtual-http-resteasy/pom.xml
index f0b6c63ef12e2..249e2efa7ddd8 100644
--- a/integration-tests/virtual-http-resteasy/pom.xml
+++ b/integration-tests/virtual-http-resteasy/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-http/pom.xml b/integration-tests/virtual-http/pom.xml
index 1cab0ad7694d4..39c8c77ace81c 100644
--- a/integration-tests/virtual-http/pom.xml
+++ b/integration-tests/virtual-http/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/amqp-virtual-threads/pom.xml b/integration-tests/virtual-threads/amqp-virtual-threads/pom.xml
index c3968ff328807..a70200204d0a7 100644
--- a/integration-tests/virtual-threads/amqp-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/amqp-virtual-threads/pom.xml
@@ -29,12 +29,12 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/amqp-virtual-threads/src/test/java/io/quarkus/it/vthreads/amqp/VirtualThreadTest.java b/integration-tests/virtual-threads/amqp-virtual-threads/src/test/java/io/quarkus/it/vthreads/amqp/VirtualThreadTest.java
index f78312ba795d5..750a7f26225e0 100644
--- a/integration-tests/virtual-threads/amqp-virtual-threads/src/test/java/io/quarkus/it/vthreads/amqp/VirtualThreadTest.java
+++ b/integration-tests/virtual-threads/amqp-virtual-threads/src/test/java/io/quarkus/it/vthreads/amqp/VirtualThreadTest.java
@@ -13,8 +13,8 @@
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @QuarkusTest
 @QuarkusTestResource(WireMockExtension.class)
diff --git a/integration-tests/virtual-threads/graphql-virtual-threads/pom.xml b/integration-tests/virtual-threads/graphql-virtual-threads/pom.xml
index 34e32d864c07b..f4f7d88c67bdc 100644
--- a/integration-tests/virtual-threads/graphql-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/graphql-virtual-threads/pom.xml
@@ -25,12 +25,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/graphql-virtual-threads/src/test/java/io/quarkus/virtual/graphql/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/graphql-virtual-threads/src/test/java/io/quarkus/virtual/graphql/RunOnVirtualThreadTest.java
index 2eab32a907490..88dce1d3c2d59 100644
--- a/integration-tests/virtual-threads/graphql-virtual-threads/src/test/java/io/quarkus/virtual/graphql/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/graphql-virtual-threads/src/test/java/io/quarkus/virtual/graphql/RunOnVirtualThreadTest.java
@@ -5,8 +5,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 
 @QuarkusTest
diff --git a/integration-tests/virtual-threads/grpc-virtual-threads/pom.xml b/integration-tests/virtual-threads/grpc-virtual-threads/pom.xml
index 48ba5037cfee4..95def50145bc2 100644
--- a/integration-tests/virtual-threads/grpc-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/grpc-virtual-threads/pom.xml
@@ -29,12 +29,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/grpc-virtual-threads/src/test/java/io/quarkus/grpc/example/streaming/VertxVirtualThreadTest.java b/integration-tests/virtual-threads/grpc-virtual-threads/src/test/java/io/quarkus/grpc/example/streaming/VertxVirtualThreadTest.java
index f480f0139b76e..4dd7a6be95d6c 100644
--- a/integration-tests/virtual-threads/grpc-virtual-threads/src/test/java/io/quarkus/grpc/example/streaming/VertxVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/grpc-virtual-threads/src/test/java/io/quarkus/grpc/example/streaming/VertxVirtualThreadTest.java
@@ -3,8 +3,8 @@
 import io.quarkus.grpc.test.utils.VertxGRPCTestProfile;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @QuarkusTest
 @TestProfile(VertxGRPCTestProfile.class)
diff --git a/integration-tests/virtual-threads/grpc-virtual-threads/src/test/java/io/quarkus/grpc/example/streaming/VirtualThreadTest.java b/integration-tests/virtual-threads/grpc-virtual-threads/src/test/java/io/quarkus/grpc/example/streaming/VirtualThreadTest.java
index b5c773153a0c9..bcdab8f79aeea 100644
--- a/integration-tests/virtual-threads/grpc-virtual-threads/src/test/java/io/quarkus/grpc/example/streaming/VirtualThreadTest.java
+++ b/integration-tests/virtual-threads/grpc-virtual-threads/src/test/java/io/quarkus/grpc/example/streaming/VirtualThreadTest.java
@@ -1,8 +1,8 @@
 package io.quarkus.grpc.example.streaming;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @QuarkusTest
 @VirtualThreadUnit
diff --git a/integration-tests/virtual-threads/jms-virtual-threads/pom.xml b/integration-tests/virtual-threads/jms-virtual-threads/pom.xml
index 37f9d2b6f68e7..d16da288fa17a 100644
--- a/integration-tests/virtual-threads/jms-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/jms-virtual-threads/pom.xml
@@ -53,12 +53,12 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -83,7 +83,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/jms-virtual-threads/src/test/java/io/quarkus/it/vthreads/jms/VirtualThreadTest.java b/integration-tests/virtual-threads/jms-virtual-threads/src/test/java/io/quarkus/it/vthreads/jms/VirtualThreadTest.java
index 08c1b38c144ed..e3d426f992c77 100644
--- a/integration-tests/virtual-threads/jms-virtual-threads/src/test/java/io/quarkus/it/vthreads/jms/VirtualThreadTest.java
+++ b/integration-tests/virtual-threads/jms-virtual-threads/src/test/java/io/quarkus/it/vthreads/jms/VirtualThreadTest.java
@@ -14,8 +14,8 @@
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @QuarkusTest
 @QuarkusTestResource(WireMockExtension.class)
diff --git a/integration-tests/virtual-threads/kafka-virtual-threads/pom.xml b/integration-tests/virtual-threads/kafka-virtual-threads/pom.xml
index 8817ad721acfc..a4e4518658a0a 100644
--- a/integration-tests/virtual-threads/kafka-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/kafka-virtual-threads/pom.xml
@@ -28,12 +28,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/kafka-virtual-threads/src/test/java/io/quarkus/it/vthreads/kafka/VirtualThreadTest.java b/integration-tests/virtual-threads/kafka-virtual-threads/src/test/java/io/quarkus/it/vthreads/kafka/VirtualThreadTest.java
index ca5060e18aec1..fcc927deeec18 100644
--- a/integration-tests/virtual-threads/kafka-virtual-threads/src/test/java/io/quarkus/it/vthreads/kafka/VirtualThreadTest.java
+++ b/integration-tests/virtual-threads/kafka-virtual-threads/src/test/java/io/quarkus/it/vthreads/kafka/VirtualThreadTest.java
@@ -13,8 +13,8 @@
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @QuarkusTest
 @QuarkusTestResource(WireMockExtension.class)
diff --git a/integration-tests/virtual-threads/mailer-virtual-threads/pom.xml b/integration-tests/virtual-threads/mailer-virtual-threads/pom.xml
index cfc12ecd060e3..a97b8c2944e45 100644
--- a/integration-tests/virtual-threads/mailer-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/mailer-virtual-threads/pom.xml
@@ -29,12 +29,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/mailer-virtual-threads/src/test/java/io/quarkus/virtual/mail/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/mailer-virtual-threads/src/test/java/io/quarkus/virtual/mail/RunOnVirtualThreadTest.java
index 659dc606b7e4a..ba76c87dd1b91 100644
--- a/integration-tests/virtual-threads/mailer-virtual-threads/src/test/java/io/quarkus/virtual/mail/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/mailer-virtual-threads/src/test/java/io/quarkus/virtual/mail/RunOnVirtualThreadTest.java
@@ -8,8 +8,8 @@
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
diff --git a/integration-tests/virtual-threads/metrics-virtual-threads/pom.xml b/integration-tests/virtual-threads/metrics-virtual-threads/pom.xml
index 14d522bdd9405..f721f63d70997 100644
--- a/integration-tests/virtual-threads/metrics-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/metrics-virtual-threads/pom.xml
@@ -37,12 +37,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/metrics-virtual-threads/src/test/java/io/quarkus/virtual/vertx/web/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/metrics-virtual-threads/src/test/java/io/quarkus/virtual/vertx/web/RunOnVirtualThreadTest.java
index 9175d7536ca71..f8fb09bb376fe 100644
--- a/integration-tests/virtual-threads/metrics-virtual-threads/src/test/java/io/quarkus/virtual/vertx/web/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/metrics-virtual-threads/src/test/java/io/quarkus/virtual/vertx/web/RunOnVirtualThreadTest.java
@@ -7,8 +7,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @QuarkusTest
 @VirtualThreadUnit
diff --git a/integration-tests/virtual-threads/quartz-virtual-threads/pom.xml b/integration-tests/virtual-threads/quartz-virtual-threads/pom.xml
index 018522f36fea7..67228ece89abe 100644
--- a/integration-tests/virtual-threads/quartz-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/quartz-virtual-threads/pom.xml
@@ -29,12 +29,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/quartz-virtual-threads/src/test/java/io/quarkus/virtual/mail/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/quartz-virtual-threads/src/test/java/io/quarkus/virtual/mail/RunOnVirtualThreadTest.java
index 2a6244806d48b..3655e5ccf80e3 100644
--- a/integration-tests/virtual-threads/quartz-virtual-threads/src/test/java/io/quarkus/virtual/mail/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/quartz-virtual-threads/src/test/java/io/quarkus/virtual/mail/RunOnVirtualThreadTest.java
@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 import io.restassured.common.mapper.TypeRef;
 
diff --git a/integration-tests/virtual-threads/reactive-routes-virtual-threads/pom.xml b/integration-tests/virtual-threads/reactive-routes-virtual-threads/pom.xml
index b3f982c157707..33df366a811f6 100644
--- a/integration-tests/virtual-threads/reactive-routes-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/reactive-routes-virtual-threads/pom.xml
@@ -25,12 +25,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/reactive-routes-virtual-threads/src/test/java/io/quarkus/virtual/vertx/web/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/reactive-routes-virtual-threads/src/test/java/io/quarkus/virtual/vertx/web/RunOnVirtualThreadTest.java
index 9175d7536ca71..f8fb09bb376fe 100644
--- a/integration-tests/virtual-threads/reactive-routes-virtual-threads/src/test/java/io/quarkus/virtual/vertx/web/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/reactive-routes-virtual-threads/src/test/java/io/quarkus/virtual/vertx/web/RunOnVirtualThreadTest.java
@@ -7,8 +7,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 
 @QuarkusTest
 @VirtualThreadUnit
diff --git a/integration-tests/virtual-threads/redis-virtual-threads/pom.xml b/integration-tests/virtual-threads/redis-virtual-threads/pom.xml
index 75c2997a027eb..25ac8314b5d9b 100644
--- a/integration-tests/virtual-threads/redis-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/redis-virtual-threads/pom.xml
@@ -33,12 +33,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/redis-virtual-threads/src/test/java/io/quarkus/virtual/redis/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/redis-virtual-threads/src/test/java/io/quarkus/virtual/redis/RunOnVirtualThreadTest.java
index e0c7d648457f1..892b21a6a287d 100644
--- a/integration-tests/virtual-threads/redis-virtual-threads/src/test/java/io/quarkus/virtual/redis/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/redis-virtual-threads/src/test/java/io/quarkus/virtual/redis/RunOnVirtualThreadTest.java
@@ -6,8 +6,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 
 @QuarkusTest
diff --git a/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/pom.xml b/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/pom.xml
index 1bcae8d4d9faf..770a0f1dc855f 100644
--- a/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/pom.xml
@@ -29,12 +29,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/src/test/java/io/quarkus/virtual/rest/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/src/test/java/io/quarkus/virtual/rest/RunOnVirtualThreadTest.java
index 8ff0ccff1f41c..b9d544d6315bc 100644
--- a/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/src/test/java/io/quarkus/virtual/rest/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/rest-client-reactive-virtual-threads/src/test/java/io/quarkus/virtual/rest/RunOnVirtualThreadTest.java
@@ -5,8 +5,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 
 @QuarkusTest
diff --git a/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/pom.xml b/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/pom.xml
index e549ea4ce3825..0d566b8ceca01 100644
--- a/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/pom.xml
@@ -25,12 +25,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/src/test/java/io/quarkus/virtual/rr/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/src/test/java/io/quarkus/virtual/rr/RunOnVirtualThreadTest.java
index 1012012b040ff..83d7b5f746b69 100644
--- a/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/src/test/java/io/quarkus/virtual/rr/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/resteasy-reactive-virtual-threads/src/test/java/io/quarkus/virtual/rr/RunOnVirtualThreadTest.java
@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 
 @QuarkusTest
diff --git a/integration-tests/virtual-threads/scheduler-virtual-threads/pom.xml b/integration-tests/virtual-threads/scheduler-virtual-threads/pom.xml
index 990810dacda5d..83c75bac400d9 100644
--- a/integration-tests/virtual-threads/scheduler-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/scheduler-virtual-threads/pom.xml
@@ -29,12 +29,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/scheduler-virtual-threads/src/test/java/io/quarkus/virtual/scheduler/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/scheduler-virtual-threads/src/test/java/io/quarkus/virtual/scheduler/RunOnVirtualThreadTest.java
index 42ad3e929cf15..4961f28ad4e75 100644
--- a/integration-tests/virtual-threads/scheduler-virtual-threads/src/test/java/io/quarkus/virtual/scheduler/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/scheduler-virtual-threads/src/test/java/io/quarkus/virtual/scheduler/RunOnVirtualThreadTest.java
@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 import io.restassured.common.mapper.TypeRef;
 
diff --git a/integration-tests/virtual-threads/security-webauthn-virtual-threads/pom.xml b/integration-tests/virtual-threads/security-webauthn-virtual-threads/pom.xml
index 3d4f0932f4367..a1a81301eb11b 100644
--- a/integration-tests/virtual-threads/security-webauthn-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/security-webauthn-virtual-threads/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <!--We use it in compile scope -->
@@ -38,8 +38,8 @@
             <artifactId>quarkus-test-security-webauthn</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/security-webauthn-virtual-threads/src/test/java/io/quarkus/virtual/security/webauthn/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/security-webauthn-virtual-threads/src/test/java/io/quarkus/virtual/security/webauthn/RunOnVirtualThreadTest.java
index 145e64ad43d16..e8e4490c64f2c 100644
--- a/integration-tests/virtual-threads/security-webauthn-virtual-threads/src/test/java/io/quarkus/virtual/security/webauthn/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/security-webauthn-virtual-threads/src/test/java/io/quarkus/virtual/security/webauthn/RunOnVirtualThreadTest.java
@@ -13,8 +13,8 @@
 import io.quarkus.security.webauthn.WebAuthnUserProvider;
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.quarkus.test.security.webauthn.WebAuthnEndpointHelper;
 import io.quarkus.test.security.webauthn.WebAuthnHardware;
 import io.restassured.RestAssured;
diff --git a/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/pom.xml b/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/pom.xml
index 3ba923070ef6e..65c37f5496f1e 100644
--- a/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/pom.xml
+++ b/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/pom.xml
@@ -25,12 +25,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/src/test/java/io/quarkus/virtual/vertx/RunOnVirtualThreadTest.java b/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/src/test/java/io/quarkus/virtual/vertx/RunOnVirtualThreadTest.java
index d9dc0285247e6..0e49d4ffe0df5 100644
--- a/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/src/test/java/io/quarkus/virtual/vertx/RunOnVirtualThreadTest.java
+++ b/integration-tests/virtual-threads/vertx-event-bus-virtual-threads/src/test/java/io/quarkus/virtual/vertx/RunOnVirtualThreadTest.java
@@ -6,8 +6,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 
 @QuarkusTest
diff --git a/integration-tests/virtual-threads/virtual-threads-disabled/pom.xml b/integration-tests/virtual-threads/virtual-threads-disabled/pom.xml
index c5c0210def13c..2234ed93eafc6 100644
--- a/integration-tests/virtual-threads/virtual-threads-disabled/pom.xml
+++ b/integration-tests/virtual-threads/virtual-threads-disabled/pom.xml
@@ -25,12 +25,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus.junit5</groupId>
-            <artifactId>junit5-virtual-threads</artifactId>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/virtual-threads/virtual-threads-disabled/src/test/java/io/quarkus/virtual/disabled/RunOnVirtualThreadDisabledTest.java b/integration-tests/virtual-threads/virtual-threads-disabled/src/test/java/io/quarkus/virtual/disabled/RunOnVirtualThreadDisabledTest.java
index 8fef3565fc1f3..b31549c2ad7f2 100644
--- a/integration-tests/virtual-threads/virtual-threads-disabled/src/test/java/io/quarkus/virtual/disabled/RunOnVirtualThreadDisabledTest.java
+++ b/integration-tests/virtual-threads/virtual-threads-disabled/src/test/java/io/quarkus/virtual/disabled/RunOnVirtualThreadDisabledTest.java
@@ -7,8 +7,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit5.virtual.ShouldNotPin;
-import io.quarkus.test.junit5.virtual.VirtualThreadUnit;
+import io.quarkus.test.junit.virtual.ShouldNotPin;
+import io.quarkus.test.junit.virtual.VirtualThreadUnit;
 import io.restassured.RestAssured;
 
 @QuarkusTest
diff --git a/integration-tests/web-dependency-locator/pom.xml b/integration-tests/web-dependency-locator/pom.xml
index 0dff717428ee2..a1453ed35e187 100644
--- a/integration-tests/web-dependency-locator/pom.xml
+++ b/integration-tests/web-dependency-locator/pom.xml
@@ -42,7 +42,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/websockets-next/pom.xml b/integration-tests/websockets-next/pom.xml
index ba98a606d088d..713f29ecf2206 100644
--- a/integration-tests/websockets-next/pom.xml
+++ b/integration-tests/websockets-next/pom.xml
@@ -21,7 +21,7 @@
     
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/integration-tests/websockets/pom.xml b/integration-tests/websockets/pom.xml
index 39eb517276dea..713ea5a80283e 100644
--- a/integration-tests/websockets/pom.xml
+++ b/integration-tests/websockets/pom.xml
@@ -29,7 +29,7 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index edfd2b630b9bb..03bd18fa882c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
         <proto-google-common-protos.version>2.63.1</proto-google-common-protos.version>
         <perfmark.version>0.27.0</perfmark.version><!-- dependency of io.grpc:grpc-core not managed in io.grpc:grpc-bom -->
 
-        <!-- Used in the build parent and test BOM (for the junit 5 plugin) and in the BOM (for the API) -->
+        <!-- Used in the build parent and test BOM (for the JUnit plugin) and in the BOM (for the API) -->
         <smallrye-certificate-generator.version>0.9.2</smallrye-certificate-generator.version>
 
         <!-- TestNG version: we don't enforce it in the BOM as it is mostly used in the MP TCKs and we need to use the version from the TCKs -->
@@ -113,7 +113,7 @@
         <module>independent-projects/vertx-utils</module>
         <module>independent-projects/resteasy-reactive</module>
         <module>independent-projects/extension-maven-plugin</module>
-        <module>independent-projects/junit5-virtual-threads</module>
+        <module>independent-projects/junit-virtual-threads</module>
 
         <!-- BOMs and parent POM -->
         <module>bom/application</module>
diff --git a/relocations/generaterelocations.java b/relocations/generaterelocations.java
index 51f7f33270a93..cd5000974eb7d 100755
--- a/relocations/generaterelocations.java
+++ b/relocations/generaterelocations.java
@@ -31,10 +31,15 @@ public class generaterelocations implements Runnable {
     private static final Map<String, Function<String, Relocation>> RELOCATIONS = new TreeMap<>();
 
     static {
-        Function<String, Relocation>  webjarsLocatorRelocation = a -> Relocation.ofArtifactId(a, a.replace("webjars-locator", "web-dependency-locator"),
-                "3.11");
-        RELOCATIONS.put("quarkus-webjars-locator", webjarsLocatorRelocation);
-        RELOCATIONS.put("quarkus-webjars-locator-deployment", webjarsLocatorRelocation);
+        Function<String, Relocation>  junitJupiterRelocation = a -> Relocation.ofArtifactId(a, a.replace("junit5", "junit"),
+                "3.31");
+        RELOCATIONS.put("quarkus-junit5", junitJupiterRelocation);
+        RELOCATIONS.put("quarkus-junit5-component", junitJupiterRelocation);
+        RELOCATIONS.put("quarkus-junit5-config", junitJupiterRelocation);
+        RELOCATIONS.put("quarkus-junit5-internal", junitJupiterRelocation);
+        RELOCATIONS.put("quarkus-junit5-mockito", junitJupiterRelocation);
+        RELOCATIONS.put("quarkus-junit5-mockito-config", junitJupiterRelocation);
+        RELOCATIONS.put("quarkus-junit5-component", junitJupiterRelocation);
     }
 
     private static final String RELOCATION_POM_TEMPLATE = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + //
diff --git a/relocations/junit5-virtual-threads/pom.xml b/relocations/junit5-virtual-threads/pom.xml
new file mode 100644
index 0000000000000..5ebbb2c38add9
--- /dev/null
+++ b/relocations/junit5-virtual-threads/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.quarkus.junit5</groupId>
+    <artifactId>junit5-virtual-threads</artifactId>
+    <name>Quarkus - Relocations - junit-virtual-threads</name>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus.junit</groupId>
+            <artifactId>junit-virtual-threads</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.31 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
diff --git a/relocations/pom.xml b/relocations/pom.xml
index 926a646fc4fbc..9c247c908cb9d 100644
--- a/relocations/pom.xml
+++ b/relocations/pom.xml
@@ -22,6 +22,13 @@
         <module>quarkus-webjars-locator-deployment</module>
         <module>quarkus-vertx-http-dev-ui-spi</module>
         <module>quarkus-vertx-http-dev-ui-tests</module>
+        <module>quarkus-junit5</module>
+        <module>quarkus-junit5-component</module>
+        <module>quarkus-junit5-config</module>
+        <module>quarkus-junit5-internal</module>
+        <module>quarkus-junit5-mockito</module>
+        <module>quarkus-junit5-mockito-config</module>
+        <module>junit5-virtual-threads</module>
     </modules>
 
 </project>
diff --git a/relocations/quarkus-junit5-component/pom.xml b/relocations/quarkus-junit5-component/pom.xml
new file mode 100644
index 0000000000000..1636cdd089be1
--- /dev/null
+++ b/relocations/quarkus-junit5-component/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-junit5-component</artifactId>
+    <name>Quarkus - Relocations - quarkus-junit5-component</name>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit-component</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.31 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/relocations/quarkus-junit5-config/pom.xml b/relocations/quarkus-junit5-config/pom.xml
new file mode 100644
index 0000000000000..c509dd8400986
--- /dev/null
+++ b/relocations/quarkus-junit5-config/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-junit5-config</artifactId>
+    <name>Quarkus - Relocations - quarkus-junit5-config</name>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit-config</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.31 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/relocations/quarkus-junit5-internal/pom.xml b/relocations/quarkus-junit5-internal/pom.xml
new file mode 100644
index 0000000000000..ed0c953dc37f4
--- /dev/null
+++ b/relocations/quarkus-junit5-internal/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-junit5-internal</artifactId>
+    <name>Quarkus - Relocations - quarkus-junit5-internal</name>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit-internal</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.31 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/relocations/quarkus-junit5-mockito-config/pom.xml b/relocations/quarkus-junit5-mockito-config/pom.xml
new file mode 100644
index 0000000000000..fd84abd4750de
--- /dev/null
+++ b/relocations/quarkus-junit5-mockito-config/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-junit5-mockito-config</artifactId>
+    <name>Quarkus - Relocations - quarkus-junit5-mockito-config</name>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit-mockito-config</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.31 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/relocations/quarkus-junit5-mockito/pom.xml b/relocations/quarkus-junit5-mockito/pom.xml
new file mode 100644
index 0000000000000..dea22184831da
--- /dev/null
+++ b/relocations/quarkus-junit5-mockito/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-junit5-mockito</artifactId>
+    <name>Quarkus - Relocations - quarkus-junit5-mockito</name>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit-mockito</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.31 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/relocations/quarkus-junit5/pom.xml b/relocations/quarkus-junit5/pom.xml
new file mode 100644
index 0000000000000..1102c456c0583
--- /dev/null
+++ b/relocations/quarkus-junit5/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-relocations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-junit5</artifactId>
+    <name>Quarkus - Relocations - quarkus-junit5</name>
+
+    <distributionManagement>
+        <relocation>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit</artifactId>
+            <version>${project.version}</version>
+            <message>Update the artifactId in your project build file. Refer to https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.31 for more information.</message>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/tcks/resteasy-reactive/pom.xml b/tcks/resteasy-reactive/pom.xml
index 5114077a995db..750178406381a 100644
--- a/tcks/resteasy-reactive/pom.xml
+++ b/tcks/resteasy-reactive/pom.xml
@@ -17,7 +17,7 @@
     <properties>
 
         <!-- to avoid sudden surprises, checkout is pinned to a specific commit -->
-        <resteasy-reactive-testsuite.repo.ref>7aabd9b98f8fdb1f3ee634f7594bd224ea159a34</resteasy-reactive-testsuite.repo.ref>
+        <resteasy-reactive-testsuite.repo.ref>2df8e2d9ec639186d1e98b01e62785ecbfad6288</resteasy-reactive-testsuite.repo.ref>
 
         <exec.skip>${skipTests}</exec.skip>
         <resteasy-reactive-testsuite.clone.skip>${exec.skip}</resteasy-reactive-testsuite.clone.skip>
@@ -123,12 +123,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/test-framework/common/src/main/java/io/quarkus/test/InjectMock.java b/test-framework/common/src/main/java/io/quarkus/test/InjectMock.java
index 1631659386b77..385904f6984c3 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/InjectMock.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/InjectMock.java
@@ -13,7 +13,7 @@
  * This annotation is supported:
  * <ul>
  * <li>for fields and method parameters in a {@code io.quarkus.test.component.QuarkusComponentTest},</li>
- * <li>for fields in a {@code io.quarkus.test.QuarkusTest} if {@code quarkus-junit5-mockito} is present.</li>
+ * <li>for fields in a {@code io.quarkus.test.QuarkusTest} if {@code quarkus-junit-mockito} is present.</li>
  * </ul>
  * The lifecycle and configuration API of the injected mock depends on the type of test being used.
  * <p>
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/FacadeClassLoaderProvider.java b/test-framework/common/src/main/java/io/quarkus/test/common/FacadeClassLoaderProvider.java
index 1037e88265190..4701099034929 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/FacadeClassLoaderProvider.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/FacadeClassLoaderProvider.java
@@ -1,7 +1,8 @@
 package io.quarkus.test.common;
 
 /**
- * This internal SPI is used by {@code io.quarkus.test.junit.classloading.FacadeClassLoader} from quarkus-junit5 to extend its
+ * This internal SPI is used by {@code io.quarkus.test.junit.classloading.FacadeClassLoader} from quarkus-junit to
+ * extend its
  * functionality.
  */
 public interface FacadeClassLoaderProvider {
diff --git a/test-framework/grpc/pom.xml b/test-framework/grpc/pom.xml
index 30fbe18b70f4f..a072b5534816a 100644
--- a/test-framework/grpc/pom.xml
+++ b/test-framework/grpc/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/test-framework/jacoco/runtime/pom.xml b/test-framework/jacoco/runtime/pom.xml
index 6fffa49a22dcf..0b26b5dc1dc7a 100644
--- a/test-framework/jacoco/runtime/pom.xml
+++ b/test-framework/jacoco/runtime/pom.xml
@@ -44,12 +44,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-component</artifactId>
+            <artifactId>quarkus-junit-component</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test-framework/junit5-component/pom.xml b/test-framework/junit-component/pom.xml
similarity index 92%
rename from test-framework/junit5-component/pom.xml
rename to test-framework/junit-component/pom.xml
index 5d96735561ebf..a6c912a0d1d7c 100644
--- a/test-framework/junit5-component/pom.xml
+++ b/test-framework/junit-component/pom.xml
@@ -10,8 +10,8 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-junit5-component</artifactId>
-    <name>Quarkus - Test Framework - JUnit 5 Component Test Framework</name>
+    <artifactId>quarkus-junit-component</artifactId>
+    <name>Quarkus - Test Framework - JUnit Component Test Framework</name>
     <description>Makes it easy to test Quarkus components and mock their dependencies.</description>
 
     <dependencies>
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-config</artifactId>
+            <artifactId>quarkus-junit-config</artifactId>
         </dependency>
         <dependency>
             <groupId>io.smallrye.common</groupId>
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/BuildResult.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/BuildResult.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/BuildResult.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/BuildResult.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/ComponentClassLoader.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/ComponentClassLoader.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/ComponentClassLoader.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/ComponentClassLoader.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/ComponentContainer.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/ComponentContainer.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/ComponentContainer.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/ComponentContainer.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/ComponentLauncherSessionListener.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/ComponentLauncherSessionListener.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/ComponentLauncherSessionListener.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/ComponentLauncherSessionListener.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/Conditions.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/Conditions.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/Conditions.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/Conditions.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/ConfigBeanCreator.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/ConfigBeanCreator.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/ConfigBeanCreator.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/ConfigBeanCreator.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/ConfigMappingBeanCreator.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/ConfigMappingBeanCreator.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/ConfigMappingBeanCreator.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/ConfigMappingBeanCreator.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/ConfigPropertyBeanCreator.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/ConfigPropertyBeanCreator.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/ConfigPropertyBeanCreator.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/ConfigPropertyBeanCreator.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/InterceptorMethodCreator.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/InterceptorMethodCreator.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/InterceptorMethodCreator.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/InterceptorMethodCreator.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/JaxrsSingletonTransformer.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/JaxrsSingletonTransformer.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/JaxrsSingletonTransformer.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/JaxrsSingletonTransformer.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/MockBeanConfigurator.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/MockBeanConfigurator.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/MockBeanConfigurator.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/MockBeanConfigurator.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/MockBeanConfiguratorImpl.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/MockBeanConfiguratorImpl.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/MockBeanConfiguratorImpl.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/MockBeanConfiguratorImpl.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/MockBeanCreator.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/MockBeanCreator.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/MockBeanCreator.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/MockBeanCreator.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentFacadeClassLoaderProvider.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentFacadeClassLoaderProvider.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentFacadeClassLoaderProvider.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentFacadeClassLoaderProvider.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTest.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTest.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTest.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTest.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestCallbacks.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestCallbacks.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestCallbacks.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestCallbacks.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestClassLoader.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestClassLoader.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestClassLoader.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestClassLoader.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestConfigSource.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestConfigSource.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestConfigSource.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestConfigSource.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestConfiguration.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestConfiguration.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestConfiguration.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestConfiguration.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtension.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtension.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtension.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtension.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtensionBuilder.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtensionBuilder.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtensionBuilder.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/QuarkusComponentTestExtensionBuilder.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/SkipInject.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/SkipInject.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/SkipInject.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/SkipInject.java
diff --git a/test-framework/junit5-component/src/main/java/io/quarkus/test/component/TestConfigProperty.java b/test-framework/junit-component/src/main/java/io/quarkus/test/component/TestConfigProperty.java
similarity index 100%
rename from test-framework/junit5-component/src/main/java/io/quarkus/test/component/TestConfigProperty.java
rename to test-framework/junit-component/src/main/java/io/quarkus/test/component/TestConfigProperty.java
diff --git a/test-framework/junit5-component/src/main/resources/META-INF/services/io.quarkus.test.common.FacadeClassLoaderProvider b/test-framework/junit-component/src/main/resources/META-INF/services/io.quarkus.test.common.FacadeClassLoaderProvider
similarity index 100%
rename from test-framework/junit5-component/src/main/resources/META-INF/services/io.quarkus.test.common.FacadeClassLoaderProvider
rename to test-framework/junit-component/src/main/resources/META-INF/services/io.quarkus.test.common.FacadeClassLoaderProvider
diff --git a/test-framework/junit5-component/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/test-framework/junit-component/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
similarity index 100%
rename from test-framework/junit5-component/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
rename to test-framework/junit-component/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
diff --git a/test-framework/junit5-component/src/main/resources/application.properties b/test-framework/junit-component/src/main/resources/application.properties
similarity index 100%
rename from test-framework/junit5-component/src/main/resources/application.properties
rename to test-framework/junit-component/src/main/resources/application.properties
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/AnnotationsTransformerTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/AnnotationsTransformerTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/AnnotationsTransformerTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/AnnotationsTransformerTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/ApplicationPropertiesConfigSourceTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/ApplicationPropertiesConfigSourceTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/ApplicationPropertiesConfigSourceTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/ApplicationPropertiesConfigSourceTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/DependencyMockingTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/DependencyMockingTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/DependencyMockingTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/DependencyMockingTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/InjectSpyFailureTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/InjectSpyFailureTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/InjectSpyFailureTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/InjectSpyFailureTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/MockConfiguratorTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/MockConfiguratorTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/MockConfiguratorTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/MockConfiguratorTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/MockNotSharedForClassHierarchyTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/MockNotSharedForClassHierarchyTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/MockNotSharedForClassHierarchyTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/MockNotSharedForClassHierarchyTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/MockSharedForClassHierarchyTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/MockSharedForClassHierarchyTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/MockSharedForClassHierarchyTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/MockSharedForClassHierarchyTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/ObserverInjectingMockTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/ObserverInjectingMockTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/ObserverInjectingMockTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/ObserverInjectingMockTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/ProgrammaticLookupMockTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/ProgrammaticLookupMockTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/ProgrammaticLookupMockTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/ProgrammaticLookupMockTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/UnsetConfigurationPropertiesTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/UnsetConfigurationPropertiesTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/UnsetConfigurationPropertiesTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/UnsetConfigurationPropertiesTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/Alpha.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/Alpha.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/Alpha.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/Alpha.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/Bravo.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/Bravo.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/Bravo.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/Bravo.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/Charlie.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/Charlie.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/Charlie.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/Charlie.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/Delta.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/Delta.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/Delta.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/Delta.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/MultiPropComponent.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/MultiPropComponent.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/MultiPropComponent.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/MultiPropComponent.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/MyComponent.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/MyComponent.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/MyComponent.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/MyComponent.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/MyOtherComponent.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/MyOtherComponent.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/MyOtherComponent.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/MyOtherComponent.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/MySimpleComponent.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/MySimpleComponent.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/MySimpleComponent.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/MySimpleComponent.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/SimpleQualifier.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/SimpleQualifier.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/beans/SimpleQualifier.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/beans/SimpleQualifier.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/callbacks/MyTestCallbacks.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/callbacks/MyTestCallbacks.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/callbacks/MyTestCallbacks.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/callbacks/MyTestCallbacks.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/callbacks/QuarkusComponentTestCallbacksTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/callbacks/QuarkusComponentTestCallbacksTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/callbacks/QuarkusComponentTestCallbacksTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/callbacks/QuarkusComponentTestCallbacksTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigBuilderCustomizerTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigBuilderCustomizerTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigBuilderCustomizerTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigBuilderCustomizerTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigConverterExtensionTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigConverterExtensionTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigConverterExtensionTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigConverterExtensionTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigConverterTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigConverterTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigConverterTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigConverterTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigMappingTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigMappingTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigMappingTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigMappingTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigSourceOrdinalTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigSourceOrdinalTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/config/ConfigSourceOrdinalTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/config/ConfigSourceOrdinalTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/AnnotationsTransformerTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/AnnotationsTransformerTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/AnnotationsTransformerTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/AnnotationsTransformerTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ConfigPropertyDeclaredOnMethodOverridesClassTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ConfigPropertyDeclaredOnMethodOverridesClassTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ConfigPropertyDeclaredOnMethodOverridesClassTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ConfigPropertyDeclaredOnMethodOverridesClassTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ConfigPropertyDeclaredOnMethodTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ConfigPropertyDeclaredOnMethodTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ConfigPropertyDeclaredOnMethodTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ConfigPropertyDeclaredOnMethodTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/DeclarativeDependencyMockingTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/DeclarativeDependencyMockingTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/DeclarativeDependencyMockingTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/DeclarativeDependencyMockingTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/DeclarativeUnsetConfigurationPropertiesTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/DeclarativeUnsetConfigurationPropertiesTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/DeclarativeUnsetConfigurationPropertiesTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/DeclarativeUnsetConfigurationPropertiesTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/IgnoreNestedClassesTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/IgnoreNestedClassesTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/IgnoreNestedClassesTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/IgnoreNestedClassesTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InstanceComponentTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InstanceComponentTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InstanceComponentTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InstanceComponentTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InstanceInterfaceTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InstanceInterfaceTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InstanceInterfaceTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InstanceInterfaceTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InstanceInterfaceUnremovableTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InstanceInterfaceUnremovableTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InstanceInterfaceUnremovableTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InstanceInterfaceUnremovableTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InterceptorMethodsTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InterceptorMethodsTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InterceptorMethodsTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InterceptorMethodsTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InterceptorMockingTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InterceptorMockingTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/InterceptorMockingTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/InterceptorMockingTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/JaxrsSingletonTransformerTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/JaxrsSingletonTransformerTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/JaxrsSingletonTransformerTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/JaxrsSingletonTransformerTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ListAllComponentTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ListAllComponentTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ListAllComponentTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ListAllComponentTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ListAllInterfaceTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ListAllInterfaceTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ListAllInterfaceTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ListAllInterfaceTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ListAllInterfaceUnremovableTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ListAllInterfaceUnremovableTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ListAllInterfaceUnremovableTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ListAllInterfaceUnremovableTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ListAllMockTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ListAllMockTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/ListAllMockTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/ListAllMockTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/MockEventTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/MockEventTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/MockEventTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/MockEventTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/MockInjectedEventTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/MockInjectedEventTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/MockInjectedEventTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/MockInjectedEventTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/MultipleConfigPropertiesDeclaredOnMethodTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/MultipleConfigPropertiesDeclaredOnMethodTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/MultipleConfigPropertiesDeclaredOnMethodTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/MultipleConfigPropertiesDeclaredOnMethodTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/SomeBean.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/SomeBean.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/SomeBean.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/SomeBean.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/SomeInterface.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/SomeInterface.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/SomeInterface.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/SomeInterface.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/SuperClassInjectionTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/SuperClassInjectionTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/SuperClassInjectionTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/SuperClassInjectionTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/SuperTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/SuperTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/declarative/SuperTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/declarative/SuperTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/lifecycle/PerClassLifecycleTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/lifecycle/PerClassLifecycleTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/lifecycle/PerClassLifecycleTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/lifecycle/PerClassLifecycleTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/lifecycle/PerMethodLifecycleTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/lifecycle/PerMethodLifecycleTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/lifecycle/PerMethodLifecycleTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/lifecycle/PerMethodLifecycleTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/mockito/MockitoExtensionTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/mockito/MockitoExtensionTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/mockito/MockitoExtensionTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/mockito/MockitoExtensionTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/NestedNestedTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/NestedNestedTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/NestedNestedTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/NestedNestedTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/NestedParamInjectTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/NestedParamInjectTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/NestedParamInjectTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/NestedParamInjectTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/NestedTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/NestedTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/NestedTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/NestedTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/TopPerClassNestedPerClassTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/TopPerClassNestedPerClassTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/TopPerClassNestedPerClassTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/TopPerClassNestedPerClassTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/TopPerClassNestedPerMethodTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/TopPerClassNestedPerMethodTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/TopPerClassNestedPerMethodTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/TopPerClassNestedPerMethodTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/TopPerMethodNestedPerClassTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/TopPerMethodNestedPerClassTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/nested/TopPerMethodNestedPerClassTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/nested/TopPerMethodNestedPerClassTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectMockTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectMockTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectMockTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectMockTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionDependentTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionDependentTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionDependentTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionDependentTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionParameterizedTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionParameterizedTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionParameterizedTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionParameterizedTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionPerClassLifecycleTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionPerClassLifecycleTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionPerClassLifecycleTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionPerClassLifecycleTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionPerMethodLifecycleTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionPerMethodLifecycleTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionPerMethodLifecycleTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionPerMethodLifecycleTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionRepeatedTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionRepeatedTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionRepeatedTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionRepeatedTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionSkipOnMethodTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionSkipOnMethodTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionSkipOnMethodTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionSkipOnMethodTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/paraminject/ParameterInjectionTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/unsatisfied/UnsatisfiedDependencyClassHierarchyTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/unsatisfied/UnsatisfiedDependencyClassHierarchyTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/unsatisfied/UnsatisfiedDependencyClassHierarchyTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/unsatisfied/UnsatisfiedDependencyClassHierarchyTest.java
diff --git a/test-framework/junit5-component/src/test/java/io/quarkus/test/component/unsatisfied/UnsatisfiedDependencyNonbindingQualifierMemberTest.java b/test-framework/junit-component/src/test/java/io/quarkus/test/component/unsatisfied/UnsatisfiedDependencyNonbindingQualifierMemberTest.java
similarity index 100%
rename from test-framework/junit5-component/src/test/java/io/quarkus/test/component/unsatisfied/UnsatisfiedDependencyNonbindingQualifierMemberTest.java
rename to test-framework/junit-component/src/test/java/io/quarkus/test/component/unsatisfied/UnsatisfiedDependencyNonbindingQualifierMemberTest.java
diff --git a/test-framework/junit5-component/src/test/resources/META-INF/services/io.quarkus.test.component.QuarkusComponentTestCallbacks b/test-framework/junit-component/src/test/resources/META-INF/services/io.quarkus.test.component.QuarkusComponentTestCallbacks
similarity index 100%
rename from test-framework/junit5-component/src/test/resources/META-INF/services/io.quarkus.test.component.QuarkusComponentTestCallbacks
rename to test-framework/junit-component/src/test/resources/META-INF/services/io.quarkus.test.component.QuarkusComponentTestCallbacks
diff --git a/test-framework/junit5-config/pom.xml b/test-framework/junit-config/pom.xml
similarity index 90%
rename from test-framework/junit5-config/pom.xml
rename to test-framework/junit-config/pom.xml
index 9e5a21c6e54bb..7f6a54f62f11a 100644
--- a/test-framework/junit5-config/pom.xml
+++ b/test-framework/junit-config/pom.xml
@@ -10,8 +10,8 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-junit5-config</artifactId>
-    <name>Quarkus - Test Framework - JUnit 5 Config</name>
+    <artifactId>quarkus-junit-config</artifactId>
+    <name>Quarkus - Test Framework - JUnit Config</name>
 
     <dependencies>
         <dependency>
diff --git a/test-framework/junit5-config/src/main/java/io/quarkus/test/config/ConfigLauncherSession.java b/test-framework/junit-config/src/main/java/io/quarkus/test/config/ConfigLauncherSession.java
similarity index 100%
rename from test-framework/junit5-config/src/main/java/io/quarkus/test/config/ConfigLauncherSession.java
rename to test-framework/junit-config/src/main/java/io/quarkus/test/config/ConfigLauncherSession.java
diff --git a/test-framework/junit5-config/src/main/java/io/quarkus/test/config/LoggingSetupExtension.java b/test-framework/junit-config/src/main/java/io/quarkus/test/config/LoggingSetupExtension.java
similarity index 100%
rename from test-framework/junit5-config/src/main/java/io/quarkus/test/config/LoggingSetupExtension.java
rename to test-framework/junit-config/src/main/java/io/quarkus/test/config/LoggingSetupExtension.java
diff --git a/test-framework/junit5-config/src/main/java/io/quarkus/test/config/QuarkusClassOrderer.java b/test-framework/junit-config/src/main/java/io/quarkus/test/config/QuarkusClassOrderer.java
similarity index 100%
rename from test-framework/junit5-config/src/main/java/io/quarkus/test/config/QuarkusClassOrderer.java
rename to test-framework/junit-config/src/main/java/io/quarkus/test/config/QuarkusClassOrderer.java
diff --git a/test-framework/junit5-config/src/main/java/io/quarkus/test/config/TestConfigCustomizer.java b/test-framework/junit-config/src/main/java/io/quarkus/test/config/TestConfigCustomizer.java
similarity index 100%
rename from test-framework/junit5-config/src/main/java/io/quarkus/test/config/TestConfigCustomizer.java
rename to test-framework/junit-config/src/main/java/io/quarkus/test/config/TestConfigCustomizer.java
diff --git a/test-framework/junit5-config/src/main/java/io/quarkus/test/config/TestConfigProviderResolver.java b/test-framework/junit-config/src/main/java/io/quarkus/test/config/TestConfigProviderResolver.java
similarity index 100%
rename from test-framework/junit5-config/src/main/java/io/quarkus/test/config/TestConfigProviderResolver.java
rename to test-framework/junit-config/src/main/java/io/quarkus/test/config/TestConfigProviderResolver.java
diff --git a/test-framework/junit5-config/src/main/resources/META-INF/services/io.smallrye.config.SmallRyeConfigBuilderCustomizer b/test-framework/junit-config/src/main/resources/META-INF/services/io.smallrye.config.SmallRyeConfigBuilderCustomizer
similarity index 100%
rename from test-framework/junit5-config/src/main/resources/META-INF/services/io.smallrye.config.SmallRyeConfigBuilderCustomizer
rename to test-framework/junit-config/src/main/resources/META-INF/services/io.smallrye.config.SmallRyeConfigBuilderCustomizer
diff --git a/test-framework/junit5-config/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/test-framework/junit-config/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
similarity index 100%
rename from test-framework/junit5-config/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
rename to test-framework/junit-config/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/test-framework/junit5-config/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/test-framework/junit-config/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
similarity index 100%
rename from test-framework/junit5-config/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
rename to test-framework/junit-config/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
diff --git a/test-framework/junit5-config/src/main/resources/junit-platform.properties b/test-framework/junit-config/src/main/resources/junit-platform.properties
similarity index 100%
rename from test-framework/junit5-config/src/main/resources/junit-platform.properties
rename to test-framework/junit-config/src/main/resources/junit-platform.properties
diff --git a/test-framework/junit5-internal/pom.xml b/test-framework/junit-internal/pom.xml
similarity index 92%
rename from test-framework/junit5-internal/pom.xml
rename to test-framework/junit-internal/pom.xml
index ca48dc5bc9369..b8edceccd0db0 100644
--- a/test-framework/junit5-internal/pom.xml
+++ b/test-framework/junit-internal/pom.xml
@@ -10,8 +10,8 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-junit5-internal</artifactId>
-    <name>Quarkus - Test Framework - JUnit 5 Internal Test Framework</name>
+    <artifactId>quarkus-junit-internal</artifactId>
+    <name>Quarkus - Test Framework - JUnit Internal Test Framework</name>
 
     <description>
         A runner for unit tests, intended for testing Quarkus rather than
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-config</artifactId>
+            <artifactId>quarkus-junit-config</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ClearCache.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ClearCache.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ClearCache.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ClearCache.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/DevModeTestApplicationModel.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/DevModeTestApplicationModel.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/DevModeTestApplicationModel.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/DevModeTestApplicationModel.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/DisabledOnSemeru.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/DisabledOnSemeru.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/DisabledOnSemeru.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/DisabledOnSemeru.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/DisabledOnSemeruCondition.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/DisabledOnSemeruCondition.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/DisabledOnSemeruCondition.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/DisabledOnSemeruCondition.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ExclusivityChecker.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ExclusivityChecker.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ExclusivityChecker.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ExclusivityChecker.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ExportUtil.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ExportUtil.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ExportUtil.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ExportUtil.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/InMemoryLogHandler.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/InMemoryLogHandler.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/InMemoryLogHandler.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/InMemoryLogHandler.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/LogCollectingTestResource.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/LogCollectingTestResource.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/LogCollectingTestResource.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/LogCollectingTestResource.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/LogFile.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/LogFile.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/LogFile.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/LogFile.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdBuildResults.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ProdBuildResults.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdBuildResults.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ProdBuildResults.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdModeTestBuildChainBuilderConsumer.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ProdModeTestBuildChainBuilderConsumer.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdModeTestBuildChainBuilderConsumer.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ProdModeTestBuildChainBuilderConsumer.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdModeTestBuildChainCustomizerProducer.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ProdModeTestBuildChainCustomizerProducer.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdModeTestBuildChainCustomizerProducer.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ProdModeTestBuildChainCustomizerProducer.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdModeTestBuildStep.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ProdModeTestBuildStep.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdModeTestBuildStep.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ProdModeTestBuildStep.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdModeTestResults.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ProdModeTestResults.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ProdModeTestResults.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ProdModeTestResults.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/PropertiesAsset.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/PropertiesAsset.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/PropertiesAsset.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/PropertiesAsset.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ports/SocketKit.java b/test-framework/junit-internal/src/main/java/io/quarkus/test/ports/SocketKit.java
similarity index 100%
rename from test-framework/junit5-internal/src/main/java/io/quarkus/test/ports/SocketKit.java
rename to test-framework/junit-internal/src/main/java/io/quarkus/test/ports/SocketKit.java
diff --git a/test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestConfusingLogTest.java b/test-framework/junit-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestConfusingLogTest.java
similarity index 100%
rename from test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestConfusingLogTest.java
rename to test-framework/junit-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestConfusingLogTest.java
diff --git a/test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestExpectExitTest.java b/test-framework/junit-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestExpectExitTest.java
similarity index 100%
rename from test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestExpectExitTest.java
rename to test-framework/junit-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestExpectExitTest.java
diff --git a/test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestTest.java b/test-framework/junit-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestTest.java
similarity index 100%
rename from test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestTest.java
rename to test-framework/junit-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestTest.java
diff --git a/test-framework/junit5-mockito-config/pom.xml b/test-framework/junit-mockito-config/pom.xml
similarity index 79%
rename from test-framework/junit5-mockito-config/pom.xml
rename to test-framework/junit-mockito-config/pom.xml
index 505bb46ed6138..b2e122233999a 100644
--- a/test-framework/junit5-mockito-config/pom.xml
+++ b/test-framework/junit-mockito-config/pom.xml
@@ -10,11 +10,11 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-junit5-mockito-config</artifactId>
-    <name>Quarkus - Test framework - JUnit 5 - Mockito Config</name>
+    <artifactId>quarkus-junit-mockito-config</artifactId>
+    <name>Quarkus - Test framework - JUnit - Mockito Config</name>
     <description>
         Contains a MockitoConfiguration that has to be loaded parent-first to work in continuous testing.
-        It is separated from junit5-mockito to minimize the blast radius.
+        It is separated from junit-mockito to minimize the blast radius.
     </description>
 
     <dependencies>
diff --git a/test-framework/junit5-mockito-config/src/main/java/org/mockito/configuration/MockitoConfiguration.java b/test-framework/junit-mockito-config/src/main/java/org/mockito/configuration/MockitoConfiguration.java
similarity index 100%
rename from test-framework/junit5-mockito-config/src/main/java/org/mockito/configuration/MockitoConfiguration.java
rename to test-framework/junit-mockito-config/src/main/java/org/mockito/configuration/MockitoConfiguration.java
diff --git a/test-framework/junit5-mockito/pom.xml b/test-framework/junit-mockito/pom.xml
similarity index 84%
rename from test-framework/junit5-mockito/pom.xml
rename to test-framework/junit-mockito/pom.xml
index 11a97f02ad7e5..fa22cbf6ca68f 100644
--- a/test-framework/junit5-mockito/pom.xml
+++ b/test-framework/junit-mockito/pom.xml
@@ -10,13 +10,13 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-junit5-mockito</artifactId>
-    <name>Quarkus - Test framework - JUnit 5 - Mockito</name>
+    <artifactId>quarkus-junit-mockito</artifactId>
+    <name>Quarkus - Test framework - JUnit - Mockito</name>
 
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -24,10 +24,10 @@
         </dependency>
         <!-- Contains the MockitoConfiguration that adds MutinyAnswer as a default answer.
              The dependency is in this direction so that users don't need to worry about it
-             and only have to add this dependency (quarkus-junit5-mockito), but not ...-config. -->
+             and only have to add this dependency (quarkus-junit-mockito), but not ...-config. -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito-config</artifactId>
+            <artifactId>quarkus-junit-mockito-config</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/InjectSpy.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/InjectSpy.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/InjectSpy.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/InjectSpy.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/MockitoConfig.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/MockitoConfig.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/MockitoConfig.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/MockitoConfig.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoSpiesCallback.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoSpiesCallback.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoSpiesCallback.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoSpiesCallback.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MutinyAnswer.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MutinyAnswer.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MutinyAnswer.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MutinyAnswer.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterAllCallback.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterAllCallback.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterAllCallback.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterAllCallback.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterEachCallback.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterEachCallback.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterEachCallback.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/ResetMockitoMocksAfterEachCallback.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/SetMockitoMockAsBeanMockCallback.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/SetMockitoMockAsBeanMockCallback.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/SetMockitoMockAsBeanMockCallback.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/SetMockitoMockAsBeanMockCallback.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/SingletonToApplicationScopedTestBuildChainCustomizerProducer.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/SingletonToApplicationScopedTestBuildChainCustomizerProducer.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/SingletonToApplicationScopedTestBuildChainCustomizerProducer.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/SingletonToApplicationScopedTestBuildChainCustomizerProducer.java
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/UnremoveableMockTestBuildChainCustomizerProducer.java b/test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/UnremoveableMockTestBuildChainCustomizerProducer.java
similarity index 100%
rename from test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/UnremoveableMockTestBuildChainCustomizerProducer.java
rename to test-framework/junit-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/UnremoveableMockTestBuildChainCustomizerProducer.java
diff --git a/test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.buildchain.TestBuildChainCustomizerProducer b/test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.buildchain.TestBuildChainCustomizerProducer
similarity index 100%
rename from test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.buildchain.TestBuildChainCustomizerProducer
rename to test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.buildchain.TestBuildChainCustomizerProducer
diff --git a/test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback b/test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback
similarity index 100%
rename from test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback
rename to test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterAllCallback
diff --git a/test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback b/test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
similarity index 100%
rename from test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
rename to test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
diff --git a/test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback b/test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
similarity index 100%
rename from test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
rename to test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
diff --git a/test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback b/test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback
similarity index 100%
rename from test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback
rename to test-framework/junit-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback
diff --git a/test-framework/junit5/pom.xml b/test-framework/junit/pom.xml
similarity index 92%
rename from test-framework/junit5/pom.xml
rename to test-framework/junit/pom.xml
index e15b39e5b9f32..fc533e2a00a64 100644
--- a/test-framework/junit5/pom.xml
+++ b/test-framework/junit/pom.xml
@@ -10,8 +10,8 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-junit5</artifactId>
-    <name>Quarkus - Test Framework - JUnit 5</name>
+    <artifactId>quarkus-junit</artifactId>
+    <name>Quarkus - Test Framework - JUnit</name>
 
     <dependencies>
         <dependency>
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-config</artifactId>
+            <artifactId>quarkus-junit-config</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractQuarkusTestWithContextExtension.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/AbstractQuarkusTestWithContextExtension.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractQuarkusTestWithContextExtension.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/AbstractQuarkusTestWithContextExtension.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/AbstractTestWithCallbacksExtension.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AppMakerHelper.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/AppMakerHelper.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/AppMakerHelper.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/AppMakerHelper.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/ArtifactTypeUtil.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/ArtifactTypeUtil.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/ArtifactTypeUtil.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/ArtifactTypeUtil.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/ClassCoercingTestProfile.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/ClassCoercingTestProfile.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/ClassCoercingTestProfile.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/ClassCoercingTestProfile.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThan.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThanCondition.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThanCondition.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThanCondition.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMNewerThanCondition.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMOlderThan.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMOlderThan.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMOlderThan.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMOlderThan.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMOlderThanCondition.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMOlderThanCondition.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMOlderThanCondition.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DisableIfBuiltWithGraalVMOlderThanCondition.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTest.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTest.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTest.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTest.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSemeru.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DisabledOnSemeru.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSemeru.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DisabledOnSemeru.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSemeruCondition.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DisabledOnSemeruCondition.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnSemeruCondition.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DisabledOnSemeruCondition.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DotNames.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/DotNames.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/DotNames.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/DotNames.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/GraalVMVersion.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/GraalVMVersion.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/GraalVMVersion.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/GraalVMVersion.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/MockSupport.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/MockSupport.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeDevServicesHandler.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/NativeDevServicesHandler.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeDevServicesHandler.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/NativeDevServicesHandler.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/PrepareResult.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/PrepareResult.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/PrepareResult.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/PrepareResult.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMock.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusMock.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMock.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusMock.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTest.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTest.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTest.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTest.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
similarity index 99%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
index 6bb728ade01c1..eba20db231d16 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
+++ b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -47,6 +47,7 @@
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
+import org.junit.jupiter.api.extension.DynamicTestInvocationContext;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ParameterContext;
@@ -859,7 +860,8 @@ public void interceptTestMethod(Invocation<Void> invocation, ReflectiveInvocatio
     }
 
     @Override
-    public void interceptDynamicTest(Invocation<Void> invocation, ExtensionContext extensionContext) throws Throwable {
+    public void interceptDynamicTest(Invocation<Void> invocation, DynamicTestInvocationContext invocationContext,
+            ExtensionContext extensionContext) throws Throwable {
         // TODO check if this is needed; the earlier interceptor may already have done it
         if (runningQuarkusApplication == null) {
             invocation.proceed();
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtensionState.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTestExtensionState.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtensionState.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTestExtensionState.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestProfile.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTestProfile.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestProfile.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/QuarkusTestProfile.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestBuildChainFunction.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/TestBuildChainFunction.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/TestBuildChainFunction.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/TestBuildChainFunction.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestProfile.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/TestProfile.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/TestProfile.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/TestProfile.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestProfileAndProperties.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/TestProfileAndProperties.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/TestProfileAndProperties.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/TestProfileAndProperties.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestResourceUtil.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/TestResourceUtil.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/TestResourceUtil.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/TestResourceUtil.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/buildchain/TestBuildChainCustomizerProducer.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/buildchain/TestBuildChainCustomizerProducer.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/buildchain/TestBuildChainCustomizerProducer.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/buildchain/TestBuildChainCustomizerProducer.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterAllCallback.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterAllCallback.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterAllCallback.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterAllCallback.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterConstructCallback.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterConstructCallback.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterConstructCallback.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterConstructCallback.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterEachCallback.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterEachCallback.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterEachCallback.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterEachCallback.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterTestExecutionCallback.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterTestExecutionCallback.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterTestExecutionCallback.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterTestExecutionCallback.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeClassCallback.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeClassCallback.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeClassCallback.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeClassCallback.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeEachCallback.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeEachCallback.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeEachCallback.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeEachCallback.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeTestExecutionCallback.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeTestExecutionCallback.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeTestExecutionCallback.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeTestExecutionCallback.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestContext.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestContext.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestContext.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestContext.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestMethodContext.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestMethodContext.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestMethodContext.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/callback/QuarkusTestMethodContext.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/classloading/FacadeClassLoader.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/classloading/FacadeClassLoader.java
similarity index 99%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/classloading/FacadeClassLoader.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/classloading/FacadeClassLoader.java
index 82ee0b87aff65..c4497802b9096 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/classloading/FacadeClassLoader.java
+++ b/test-framework/junit/src/main/java/io/quarkus/test/junit/classloading/FacadeClassLoader.java
@@ -94,7 +94,7 @@ public final class FacadeClassLoader extends ClassLoader implements Closeable {
 
     // Ideally these would be final, but we initialise them in a try-catch block and sometimes they will be caught
 
-    // JUnit extensions can be registered by a service loader - see https://junit.org/junit5/docs/current/user-guide/#extensions-registration
+    // JUnit extensions can be registered by a service loader - see https://docs.junit.org/current/user-guide/#extensions-registration
     private boolean isServiceLoaderMechanism;
     private Method osIsCurrent;
 
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/classloading/ParentLastURLClassLoader.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/classloading/ParentLastURLClassLoader.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/classloading/ParentLastURLClassLoader.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/classloading/ParentLastURLClassLoader.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/classloading/QuarkusTestConfigProviderResolver.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/classloading/QuarkusTestConfigProviderResolver.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/classloading/QuarkusTestConfigProviderResolver.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/classloading/QuarkusTestConfigProviderResolver.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/TestInfoImpl.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/internal/TestInfoImpl.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/TestInfoImpl.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/internal/TestInfoImpl.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/VerifyMockitoMocksCallback.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/internal/VerifyMockitoMocksCallback.java
similarity index 89%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/VerifyMockitoMocksCallback.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/internal/VerifyMockitoMocksCallback.java
index 023587978d6b8..0e2442ded7174 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/VerifyMockitoMocksCallback.java
+++ b/test-framework/junit/src/main/java/io/quarkus/test/junit/internal/VerifyMockitoMocksCallback.java
@@ -10,14 +10,14 @@
 
 /**
  * This callback verifies that {@code @io.quarkus.test.InjectMock} is not declared on a field of a {@code @QuarkusTest}
- * unless the {@code quarkus-junit5-mockito} is present.
+ * unless the {@code quarkus-junit-mockito} is present.
  */
 public class VerifyMockitoMocksCallback implements QuarkusTestAfterConstructCallback {
 
     @Override
     public void afterConstruct(Object testInstance) {
         Class<? extends Annotation> mockitoConfig = loadMockitoConfig();
-        if (mockitoConfig == null) { // this means that the quarkus-junit5-mockito dependency was not added
+        if (mockitoConfig == null) { // this means that the quarkus-junit-mockito dependency was not added
             List<Field> injectMockFields = new ArrayList<>();
             Class<?> current = testInstance.getClass();
             while (current != null) {
@@ -30,7 +30,7 @@ public void afterConstruct(Object testInstance) {
             }
             if (!injectMockFields.isEmpty()) {
                 throw new IllegalStateException(
-                        "@io.quarkus.test.InjectMock declared on one or more fields of a @QuarkusTest but the quarkus-junit5-mockito dependency is not present: "
+                        "@io.quarkus.test.InjectMock declared on one or more fields of a @QuarkusTest but the quarkus-junit-mockito dependency is not present: "
                                 + injectMockFields.stream().map(f -> "/n/t- " + f.toString()));
             }
         }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ArtifactLauncherProvider.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/ArtifactLauncherProvider.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ArtifactLauncherProvider.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/ArtifactLauncherProvider.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/CustomLauncherInterceptor.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/CustomLauncherInterceptor.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/CustomLauncherInterceptor.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/CustomLauncherInterceptor.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DefaultInitContextBase.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/DefaultInitContextBase.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DefaultInitContextBase.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/DefaultInitContextBase.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ExecutionListener.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/ExecutionListener.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/ExecutionListener.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/ExecutionListener.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/main/Launch.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/main/Launch.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/main/LaunchResult.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/main/LaunchResult.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/nativeimage/ClassInclusionReport.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/nativeimage/ClassInclusionReport.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/nativeimage/ClassInclusionReport.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/nativeimage/ClassInclusionReport.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java b/test-framework/junit/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java
similarity index 100%
rename from test-framework/junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java
rename to test-framework/junit/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java
diff --git a/test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback b/test-framework/junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
similarity index 100%
rename from test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
rename to test-framework/junit/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
diff --git a/test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.launcher.ArtifactLauncherProvider b/test-framework/junit/src/main/resources/META-INF/services/io.quarkus.test.junit.launcher.ArtifactLauncherProvider
similarity index 100%
rename from test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.launcher.ArtifactLauncherProvider
rename to test-framework/junit/src/main/resources/META-INF/services/io.quarkus.test.junit.launcher.ArtifactLauncherProvider
diff --git a/test-framework/junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener b/test-framework/junit/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
similarity index 100%
rename from test-framework/junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
rename to test-framework/junit/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
diff --git a/test-framework/junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/test-framework/junit/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
similarity index 100%
rename from test-framework/junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
rename to test-framework/junit/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
diff --git a/test-framework/junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/test-framework/junit/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
similarity index 100%
rename from test-framework/junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
rename to test-framework/junit/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
diff --git a/test-framework/junit5/src/test/java/io/quarkus/test/junit/ErrorThrowingCallback.java b/test-framework/junit/src/test/java/io/quarkus/test/junit/ErrorThrowingCallback.java
similarity index 100%
rename from test-framework/junit5/src/test/java/io/quarkus/test/junit/ErrorThrowingCallback.java
rename to test-framework/junit/src/test/java/io/quarkus/test/junit/ErrorThrowingCallback.java
diff --git a/test-framework/junit5/src/test/java/io/quarkus/test/junit/QuarkusTestCallbacksErrorHandlingTest.java b/test-framework/junit/src/test/java/io/quarkus/test/junit/QuarkusTestCallbacksErrorHandlingTest.java
similarity index 100%
rename from test-framework/junit5/src/test/java/io/quarkus/test/junit/QuarkusTestCallbacksErrorHandlingTest.java
rename to test-framework/junit/src/test/java/io/quarkus/test/junit/QuarkusTestCallbacksErrorHandlingTest.java
diff --git a/test-framework/junit5/src/test/java/io/quarkus/test/junit/TestResourceUtilTest.java b/test-framework/junit/src/test/java/io/quarkus/test/junit/TestResourceUtilTest.java
similarity index 100%
rename from test-framework/junit5/src/test/java/io/quarkus/test/junit/TestResourceUtilTest.java
rename to test-framework/junit/src/test/java/io/quarkus/test/junit/TestResourceUtilTest.java
diff --git a/test-framework/junit5/src/test/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrdererTest.java b/test-framework/junit/src/test/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrdererTest.java
similarity index 100%
rename from test-framework/junit5/src/test/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrdererTest.java
rename to test-framework/junit/src/test/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrdererTest.java
diff --git a/test-framework/junit5/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test07.java b/test-framework/junit/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test07.java
similarity index 100%
rename from test-framework/junit5/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test07.java
rename to test-framework/junit/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test07.java
diff --git a/test-framework/junit5/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test08.java b/test-framework/junit/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test08.java
similarity index 100%
rename from test-framework/junit5/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test08.java
rename to test-framework/junit/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test08.java
diff --git a/test-framework/junit5/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test09.java b/test-framework/junit/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test09.java
similarity index 100%
rename from test-framework/junit5/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test09.java
rename to test-framework/junit/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test09.java
diff --git a/test-framework/junit5/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test10.java b/test-framework/junit/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test10.java
similarity index 100%
rename from test-framework/junit5/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test10.java
rename to test-framework/junit/src/test/java/io/quarkus/test/junit/util/dummyclasses/Test10.java
diff --git a/test-framework/junit5/src/test/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback b/test-framework/junit/src/test/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
similarity index 100%
rename from test-framework/junit5/src/test/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
rename to test-framework/junit/src/test/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback
diff --git a/test-framework/kafka-companion/pom.xml b/test-framework/kafka-companion/pom.xml
index 150c6b3ba2fa4..2ebf7ef4e38cb 100644
--- a/test-framework/kafka-companion/pom.xml
+++ b/test-framework/kafka-companion/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
diff --git a/test-framework/keycloak-server/pom.xml b/test-framework/keycloak-server/pom.xml
index ed2869755b1f0..ab8caf7d9012a 100644
--- a/test-framework/keycloak-server/pom.xml
+++ b/test-framework/keycloak-server/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 7394f6a3ffb14..510383f3c0fd5 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -19,12 +19,12 @@
         <module>h2</module>
         <module>grpc</module>
         <module>kubernetes-client</module>
-        <module>junit5-config</module>
-        <module>junit5-internal</module>
-        <module>junit5</module>
-        <module>junit5-component</module>
-        <module>junit5-mockito</module>
-        <module>junit5-mockito-config</module>
+        <module>junit-config</module>
+        <module>junit-internal</module>
+        <module>junit</module>
+        <module>junit-component</module>
+        <module>junit-mockito</module>
+        <module>junit-mockito-config</module>
         <module>vertx</module>
         <module>hibernate-reactive-panache</module>
         <module>arquillian</module>
diff --git a/test-framework/security-jwt/pom.xml b/test-framework/security-jwt/pom.xml
index ee3df7bf14cd9..93ceadc89e16f 100644
--- a/test-framework/security-jwt/pom.xml
+++ b/test-framework/security-jwt/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/test-framework/security-oidc/pom.xml b/test-framework/security-oidc/pom.xml
index 27aba21bfe3f4..3117006b1cc0e 100644
--- a/test-framework/security-oidc/pom.xml
+++ b/test-framework/security-oidc/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/test-framework/security-webauthn/pom.xml b/test-framework/security-webauthn/pom.xml
index 38923a799df21..299f4c9720f71 100644
--- a/test-framework/security-webauthn/pom.xml
+++ b/test-framework/security-webauthn/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/test-framework/security/pom.xml b/test-framework/security/pom.xml
index 5eeec97ddb26e..30d344fc58ba1 100644
--- a/test-framework/security/pom.xml
+++ b/test-framework/security/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>