diff --git a/core/trino-main/pom.xml b/core/trino-main/pom.xml
index 9ac55e29fc4e..4cd4292d5ddf 100644
--- a/core/trino-main/pom.xml
+++ b/core/trino-main/pom.xml
@@ -485,17 +485,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-
-            <plugin>
-                <groupId>org.gaul</groupId>
-                <artifactId>modernizer-maven-plugin</artifactId>
-                <configuration>
-                    <ignoreClassNamePatterns>
-                        <!-- we require certain org.testng.Assert methods be called via our Assert class, so that class needs to be allowed to call them -->
-                        <ignoreClassNamePattern>io/trino/testing/assertions/Assert</ignoreClassNamePattern>
-                    </ignoreClassNamePatterns>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/core/trino-main/src/main/java/io/trino/testing/assertions/Assert.java b/core/trino-main/src/main/java/io/trino/testing/assertions/Assert.java
index c85aaaeb9e35..1eb6b5aaf3ed 100644
--- a/core/trino-main/src/main/java/io/trino/testing/assertions/Assert.java
+++ b/core/trino-main/src/main/java/io/trino/testing/assertions/Assert.java
@@ -14,6 +14,7 @@
 package io.trino.testing.assertions;
 
 import io.airlift.units.Duration;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -34,11 +35,13 @@ public class Assert
 {
     private Assert() {}
 
+    @SuppressModernizer // Assert.assertEquals(Iterable, Iterable) is forbidden, advising to use this class as a safety-adding wrapper.
     public static void assertEquals(Iterable<?> actual, Iterable<?> expected)
     {
         assertEquals(actual, expected, null);
     }
 
+    @SuppressModernizer // Assert.assertEquals(Iterable, Iterable, String) is forbidden, advising to use this class as a safety-adding wrapper.
     public static void assertEquals(Iterable<?> actual, Iterable<?> expected, String message)
     {
         try {
diff --git a/plugin/trino-password-authenticators/pom.xml b/plugin/trino-password-authenticators/pom.xml
index 4b02f5b73bc2..a853a3304188 100644
--- a/plugin/trino-password-authenticators/pom.xml
+++ b/plugin/trino-password-authenticators/pom.xml
@@ -79,6 +79,11 @@
             <artifactId>validation-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+        </dependency>
+
         <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
@@ -123,19 +128,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.gaul</groupId>
-                <artifactId>modernizer-maven-plugin</artifactId>
-                <configuration>
-                    <ignoreClassNamePatterns>
-                        <!-- To allow usage of java.util.Hashtable -->
-                        <ignoreClassNamePattern>io/trino/plugin/password/jndi/JndiUtils</ignoreClassNamePattern>
-                    </ignoreClassNamePatterns>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/jndi/JndiUtils.java b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/jndi/JndiUtils.java
index 96dae055393e..315a6d046380 100644
--- a/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/jndi/JndiUtils.java
+++ b/plugin/trino-password-authenticators/src/main/java/io/trino/plugin/password/jndi/JndiUtils.java
@@ -13,6 +13,8 @@
  */
 package io.trino.plugin.password.jndi;
 
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
+
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
@@ -27,6 +29,12 @@ private JndiUtils() {}
     public static DirContext createDirContext(Map<String, String> environment)
             throws NamingException
     {
-        return new InitialDirContext(new Hashtable<>(environment));
+        return new InitialDirContext(createHashtable(environment));
+    }
+
+    @SuppressModernizer
+    private static Hashtable<String, String> createHashtable(Map<String, String> map)
+    {
+        return new Hashtable<>(map);
     }
 }