diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 2e4f8d465b66..224c07fd3a8a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -90,8 +90,7 @@ public interface ClassOrderer {
 	 * <pre class="code">
 	 * public void orderClasses(ClassOrdererContext context) {
 	 *     Collections.shuffle(context.getClassDescriptors());
-	 * }
-	 * </pre>
+	 * }</pre>
 	 *
 	 * @param context the {@code ClassOrdererContext} containing the
 	 * {@linkplain ClassDescriptor class descriptors} to order; never {@code null}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 8a91cf597666..e853106480f6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -88,8 +88,7 @@ public interface MethodOrderer {
 	 * <pre class="code">
 	 * public void orderMethods(MethodOrdererContext context) {
 	 *     Collections.shuffle(context.getMethodDescriptors());
-	 * }
-	 * </pre>
+	 * }</pre>
 	 *
 	 * @param context the {@code MethodOrdererContext} containing the
 	 * {@linkplain MethodDescriptor method descriptors} to order; never {@code null}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
index 860486e7a4c2..0f9ad73ddd30 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
@@ -57,8 +57,7 @@
  *     class SecondaryTests {
  *         // {@literal @}Test methods ...
  *     }
- * }
- * </pre>
+ * }</pre>
  *
  * @since 5.8
  * @see ClassOrderer
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
index b21130737d25..79d235d4ada4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
@@ -68,8 +68,7 @@ public interface TestInfo {
 	 *      class NestedTests {}
 	 *
 	 *      static class StaticTests {}
-	 *   }
-	 * </pre>
+	 *   }</pre>
 	 *
 	 * <p>If the context in which {@code TestInfo} is used is at the test level,
 	 * the default display name is the name of the test method concatenated with
@@ -79,8 +78,7 @@ public interface TestInfo {
 	 *
 	 * <pre class="code">
 	 *   {@literal @}Test
-	 *   void testUser(TestInfo testInfo, {@literal @}Mock User user) {}
-	 * </pre>
+	 *   void testUser(TestInfo testInfo, {@literal @}Mock User user) {}</pre>
 	 *
 	 * <p>Note that display names are typically used for test reporting in IDEs
 	 * and build tools and may contain spaces, special characters, and even emoji.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
index f61820fa5cbf..c1df77510c45 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
@@ -62,8 +62,7 @@
  *     {@literal @}Test
  *     {@literal @}Order(3)
  *     void validValues() {}
- * }
- * </pre>
+ * }</pre>
  *
  * <h2>Parallel Execution</h2>
  * <p>Using a {@link MethodOrderer} disables parallel execution unless the test
diff --git a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
index 7c069e92c41b..a9d9249f0eb1 100644
--- a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
+++ b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
@@ -9,7 +9,9 @@
  */
 
 /**
- * Defines JUnit Jupiter API for writing tests.
+ * Defines the JUnit Jupiter API for writing tests.
+ *
+ * @since 5.0
  */
 module org.junit.jupiter.api {
 	requires static transitive org.apiguardian.api;
diff --git a/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java b/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
index 44d4eceeba7f..e8e188aad477 100644
--- a/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
+++ b/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
@@ -9,7 +9,7 @@
  */
 
 /**
- * Provides the JUnit Jupiter {@linkplain org.junit.platform.engine.TestEngine}
+ * Provides the JUnit Jupiter {@link org.junit.platform.engine.TestEngine}
  * implementation.
  *
  * @since 5.0
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index 947e4c434998..e12d0421f286 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -126,8 +126,7 @@ public static <T> Set<T> toSet(T[] values) {
 	 * <pre class="code">
 	 * public static &lt;T&gt; Collector&lt;T, ?, List&lt;T&gt;&gt; toUnmodifiableList(Supplier&lt;List&lt;T&gt;&gt; listSupplier) {
 	 *     return Collectors.collectingAndThen(Collectors.toCollection(listSupplier), Collections::unmodifiableList);
-	 * }
-	 * </pre>
+	 * }</pre>
 	 *
 	 * @param <T> the type of the input elements
 	 * @return a {@code Collector} which collects all the input elements into
diff --git a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
index e073d5013414..d595f8bdcd1b 100644
--- a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
+++ b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
@@ -11,8 +11,8 @@
 /**
  * Public API for test engines.
  *
- * <p>Provides the {@linkplain org.junit.platform.engine.TestEngine} interface, test discovery
- * and execution reporting support.
+ * <p>Provides the {@link org.junit.platform.engine.TestEngine} interface,
+ * test discovery, and execution reporting support.
  *
  * @since 1.0
  */
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 5f6e9f5fe119..d1fa66711079 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -78,8 +78,7 @@
  *     )
  *     .configurationParameter("key1", "value1")
  *     .configurationParameters(configParameterMap)
- *     .build();
- * </pre>
+ *     .build();</pre>
  *
  * @since 1.0
  * @see org.junit.platform.engine.discovery.DiscoverySelectors
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
index df15db3ac148..318a6b5351ed 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
@@ -21,8 +21,8 @@
  * Utility methods for dealing with legacy reporting infrastructure, such as
  * reporting systems built on the Ant-based XML reporting format for JUnit 4.
  *
- * This class was formerly from {@code junit-platform-launcher}
- * in {@link org.junit.platform.launcher.listeners} package.
+ * <p>This class was formerly from {@code junit-platform-launcher} in the
+ * {@link org.junit.platform.launcher.listeners} package.
  *
  * @since 1.0.3
  */
diff --git a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
index 57bda1477352..62c6732235d3 100644
--- a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
+++ b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
@@ -9,7 +9,7 @@
  */
 
 /**
- * Common support utilities for declarative test suite executors.
+ * Common support utilities for declarative test suites.
  *
  * @since 1.8
  */
diff --git a/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java b/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
index 0ae28531b366..e8a43bf80e1c 100644
--- a/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
+++ b/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
@@ -9,7 +9,7 @@
  */
 
 /**
- * Provides a {@linkplain org.junit.platform.engine.TestEngine} for running
+ * Provides a {@link org.junit.platform.engine.TestEngine} for running
  * declarative test suites.
  *
  * @since 1.8
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
index 21ee8b85ce38..9d6187e5ccc1 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
@@ -101,8 +101,8 @@ public static Event executionSkipped(TestDescriptor testDescriptor, String reaso
 	 * Create a <em>started</em> {@code Event} for the supplied
 	 * {@link TestDescriptor}.
 	 *
-	 * @param testDescriptor the {@code TestDescriptor} associated with the
-	 * event; never {@code null}
+	 * @param testDescriptor the {@code TestDescriptor} associated with the event;
+	 * never {@code null}
 	 * @return the newly created {@code Event}
 	 * @see EventType#STARTED
 	 */
@@ -114,8 +114,8 @@ public static Event executionStarted(TestDescriptor testDescriptor) {
 	 * Create a <em>finished</em> {@code Event} for the supplied
 	 * {@link TestDescriptor} and {@link TestExecutionResult}.
 	 *
-	 * @param testDescriptor the {@code TestDescriptor} associated with the
-	 * event; never {@code null}
+	 * @param testDescriptor the {@code TestDescriptor} associated with the event;
+	 * never {@code null}
 	 * @param result the {@code TestExecutionResult} for the supplied
 	 * {@code TestDescriptor}; never {@code null}
 	 * @return the newly created {@code Event}
diff --git a/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java b/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
index bc3ca4659713..6880a39df91d 100644
--- a/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
+++ b/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
@@ -9,8 +9,8 @@
  */
 
 /**
- * Provides a {@linkplain org.junit.platform.engine.TestEngine} for running
- * JUnit 3 and 4 based tests on the platform.
+ * Provides a {@link org.junit.platform.engine.TestEngine} for running JUnit 3
+ * and 4 based tests on the platform.
  *
  * @since 4.12
  * @provides org.junit.platform.engine.TestEngine The {@code VintageTestEngine}