diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index ae4ec79e7..089ed644f 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -346,6 +346,7 @@
     <module name="SingleLineJavadoc"/>
     <module name="JavadocTagContinuationIndentation"/>
     <module name="JavadocParagraph"/>
+    <module name="WriteTag"/>
 
     <!--
         All Checks bellow are our futute plan to enforce over our code.
@@ -356,9 +357,6 @@
     <module name="SummaryJavadoc">
       <property name="severity" value="ignore"/>
     </module>
-    <module name="WriteTag">
-      <property name="severity" value="ignore"/>
-    </module>
 
     <module name="MissingCtor">
       <!--
diff --git a/config/suppressions.xml b/config/suppressions.xml
index 2c7cee0c4..cd8d97c48 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -38,6 +38,7 @@
     <suppress checks="MethodCount" files="[\\/]IndentationCheckTest.java$"/>
     <suppress checks="MethodCount" files="[\\/]MainTest.java$"/>
     <suppress checks="EqualsAvoidNull" files="[\\/]Int.*FilterTest.java$"/>
+    <suppress checks="WriteTag" files=".*[\\/]src[\\/]test[\\/]"/>
 
     <!-- suppressions to remove over time -->
     <suppress checks="FinalLocalVariable" files=".*[\\/]src[\\/]test[\\/]"/>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
index b6055a3d3..df92965c5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
@@ -248,6 +248,9 @@ class FileDrop {
         void filesDropped(File... files);
     }
 
+    /**
+     * Listener and handler for file drop target events.
+     */
     private class FileDropTargetListener extends DropTargetAdapter {
         /** Target component to drop to. */
         private final Component component;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java
index 8e76bdbc3..224933c9b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java
@@ -259,6 +259,9 @@ public class ParseTreeInfoPanel extends JPanel {
         }
     }
 
+    /**
+     * Filter for Java files.
+     */
     private static class JavaFileFilter extends FileFilter {
         @Override
         public boolean accept(File file) {
@@ -274,6 +277,9 @@ public class ParseTreeInfoPanel extends JPanel {
         }
     }
 
+    /**
+     * Handler for file selection action events.
+     */
     private class FileSelectionAction extends AbstractAction {
         /**
          * Serial ID.
@@ -300,6 +306,9 @@ public class ParseTreeInfoPanel extends JPanel {
         }
     }
 
+    /**
+     * Handler for reload action events.
+     */
     private class ReloadAction extends AbstractAction {
         /**
          * Serial UID.
@@ -320,6 +329,9 @@ public class ParseTreeInfoPanel extends JPanel {
         }
     }
 
+    /**
+     * Listener and handler for file dropped events.
+     */
     private class FileDropListener implements FileDrop.Listener {
         /** Scroll pane. */
         private final JScrollPane scrollPane;