diff --git a/build-tools/src/main/resources/suppressions.xml b/build-tools/src/main/resources/suppressions.xml
index 690bb7a9fc35f..becdbdeb751d3 100644
--- a/build-tools/src/main/resources/suppressions.xml
+++ b/build-tools/src/main/resources/suppressions.xml
@@ -31,6 +31,7 @@
 -->
 
 <suppressions>
-    <suppress checks="Javadoc" files=".*Tests\.java"/>
+    <suppress checks="Javadoc" files=".*Test[s]?\.java"/>
+    <suppress checks="Javadoc" files=".*Test[s]?Base\.java"/>
     <suppress checks="Javadoc" files=".*CoverageReporter\.java"/>
 </suppressions>
\ No newline at end of file