diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml
index bc28c444b..bed949951 100644
--- a/config/checkstyle_sevntu_checks.xml
+++ b/config/checkstyle_sevntu_checks.xml
@@ -87,8 +87,14 @@
             <property name="requiredParameters" value="value"/>
         </module>
         <module name="ForbidCertainImports">
-            <property name="packageNameRegexp" value="^.*(api|utils).*$"/>
-            <property name="forbiddenImportsRegexp" value="^.*checks.*|java\.util\.Vector|java\.util\.Stack$"/>
+            <property name="packageNameRegexp" value=".+"/>
+            <property name="forbiddenImportsRegexp" value="java\.util\.Stack|java\.util\.Vector"/>
+            <property name="forbiddenImportsExcludesRegexp" value=""/>
+        </module>
+        <module name="ForbidCertainImports">
+            <property name="packageNameRegexp" value=".+\.checkstyle\.api.*|.+\.checkstyle\.utils.*"/>
+            <property name="forbiddenImportsRegexp" value=".+\.checks\..+"/>
+            <property name="forbiddenImportsExcludesRegexp" value=""/>
         </module>
         <module name="LineLengthExtended">
             <property name="max" value="100"/>
diff --git a/config/sevntu_suppressions.xml b/config/sevntu_suppressions.xml
index 01aa1cf73..248387301 100644
--- a/config/sevntu_suppressions.xml
+++ b/config/sevntu_suppressions.xml
@@ -56,4 +56,11 @@
     <suppress checks="IllegalCatchExtended"
               files="CheckerTest\.java"
               lines="543"/>
+
+    <!--JavadocTagInfo.java, JavadocTags.java, InvalidJavadocTag.java, JavadocTag.java will be
+    deprecated as we completely switch to ANTLR parser for javadoc. All of the mentioned classes
+    are required only for old javadoc parsers and their usage will be excluded from
+    JavadocUtils.java and JavadocUtilsTest.java. -->
+    <suppress checks="ForbidCertainImports"
+              files="JavadocUtils\.java|JavadocUtilsTest\.java"/>
 </suppressions>
\ No newline at end of file
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailNode.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailNode.java
index 46a914e53..2ece00166 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailNode.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailNode.java
@@ -19,14 +19,12 @@
 
 package com.puppycrawl.tools.checkstyle.api;
 
-import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl;
-
 /**
  * DetailNode is used to construct tree during parsing Javadoc comments.
  * Contains array of children, parent node and other useful fields.
  *
  * @author Baratali Izmailov
- * @see JavadocNodeImpl
+ * @see com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocNodeImpl
  * @see com.puppycrawl.tools.checkstyle.checks.javadoc.AbstractJavadocCheck
  */
 public interface DetailNode {