diff --git a/ant/org.eclipse.ant.tests.ui/External Tools/org/eclipse/ant/tests/ui/externaltools/ExternalToolTestUtil.java b/ant/org.eclipse.ant.tests.ui/External Tools/org/eclipse/ant/tests/ui/externaltools/ExternalToolTestUtil.java
index 40f6e69d910..3617b63cd37 100644
--- a/ant/org.eclipse.ant.tests.ui/External Tools/org/eclipse/ant/tests/ui/externaltools/ExternalToolTestUtil.java	
+++ b/ant/org.eclipse.ant.tests.ui/External Tools/org/eclipse/ant/tests/ui/externaltools/ExternalToolTestUtil.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2013 IBM Corporation and others.
+ * Copyright (c) 2011, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -31,13 +31,6 @@
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.ui.externaltools.internal.model.BuilderUtils;
 
-import junit.framework.Test;
-
-/**
- * Abstract {@link Test} class for external tools
- *
- * @since 3.5.100 org.eclipse.ant.tests.ui
- */
 @SuppressWarnings("restriction")
 public final class ExternalToolTestUtil {
 
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java
index 7d90498bdf7..fbb6ae9c5f1 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Google, Inc and others.
+ * Copyright (c) 2017, 2026 Google, Inc and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -24,8 +24,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.function.BooleanSupplier;
-import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.eclipse.core.internal.jobs.JobManager;
@@ -125,8 +123,8 @@ public static void processUIEvents(final long millis) throws Exception {
 	/**
 	 * Waits while given condition is {@code true} for a given amount of
 	 * milliseconds. If the actual wait time exceeds given timeout and condition
-	 * will be still {@code true}, throws {@link junit.framework.AssertionError}
-	 * with given message.
+	 * will be still {@code true}, throws AssertionFailedError with given
+	 * message.
 	 * <p>
 	 * Will process UI events while waiting in UI thread, if called from
 	 * background thread, just waits.
@@ -163,6 +161,7 @@ public static void waitWhile(BooleanSupplier condition, long timeout, Supplier<S
 	 * <p>
 	 * Will process UI events while waiting in UI thread, if called from
 	 * background thread, just waits.
+	 * </p>
 	 *
 	 * @param condition function which will be evaluated while waiting
 	 * @param errorMessage message which will be used to construct the failure
@@ -175,11 +174,11 @@ public static void waitWhile(BooleanSupplier condition, Supplier<String> errorMe
 
 	/**
 	 * A simplified variant of
-	 * {@link #waitWhile(Predicate, Object, long, Function)}.
+	 * {@link #waitWhile(BooleanSupplier, long, Supplier)}.
 	 * <p>
 	 * Waits while given condition is {@code true} for a given amount of
 	 * milliseconds.
-	 * <p>
+	 * </p>
 	 * Will process UI events while waiting in UI thread, if called from
 	 * background thread, just waits.
 	 *
diff --git a/pom.xml b/pom.xml
index 575630655e9..550290ef76d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
   <properties>
     <tycho.scmUrl>scm:git:https://github.com/eclipse-platform/eclipse.platform.git</tycho.scmUrl>
     <tycho.surefire.testClassesDirectory>${project.build.outputDirectory}</tycho.surefire.testClassesDirectory>
+    <failOnJavadocErrors>true</failOnJavadocErrors>
   </properties>
 
   <!--