diff --git a/config/sevntu_suppressions.xml b/config/sevntu_suppressions.xml
index 3254e1554..dd58d641c 100644
--- a/config/sevntu_suppressions.xml
+++ b/config/sevntu_suppressions.xml
@@ -49,7 +49,8 @@
               files="AbstractViolationReporter.java"
               lines="152,164"/>
 
-    <!-- Tone down the checking for test code -->
-    <suppress checks="CauseParameterInException|ForbidCCommentsInMethods|IllegalCatchExtended"
-              files=".*[\\/]src[\\/](test|it)[\\/]"/>
+    <!-- testing for catch Error is part of 100% coverage -->
+    <suppress checks="IllegalCatchExtended"
+              files="CheckerTest\.java"
+              lines="569"/>
 </suppressions>
\ No newline at end of file
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java
index f83a8dbf8..a27ff2c4e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java
@@ -206,7 +206,7 @@ public class XMLLoggerTest {
             new LocalizedMessage(1, 1,
                 "messages.properties", null, null, null, getClass(), null);
         final AuditEvent ev = new AuditEvent(this, "Test.java", message);
-        logger.addException(ev, new TestException());
+        logger.addException(ev, new TestException("msg", new RuntimeException("msg")));
         logger.auditFinished(null);
         final String[] expectedLines = {
             "&lt;exception&gt;",
@@ -261,6 +261,10 @@ public class XMLLoggerTest {
 
         private static final long serialVersionUID = 1L;
 
+        TestException(String msg, Throwable cause) {
+            super(msg, cause);
+        }
+
         @Override
         public void printStackTrace(PrintWriter printWriter) {
             printWriter.print("stackTrace");
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
index 01a611158..de7147e3d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
@@ -243,10 +243,6 @@ public class ImportOrderCheckTest extends BaseCheckTestSupport {
     public void testWildcardUnspecified() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(ImportOrderCheck.class);
 
-        /*
-        <property name="ordered" value="true"/>
-        <property name="separated" value="true"/>
-        */
         checkConfig.addAttribute("groups", "java,javax,org");
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
index c41e09aaf..d2f7de76f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
@@ -120,11 +120,9 @@ public class CommitValidationTest {
             final String commitMessage = commit.getFullMessage();
             final Matcher matcher = NEWLINE_PATTERN.matcher(commitMessage);
             if (matcher.find()) {
-                /**
-                 * Git by default put newline character at the end of commit message. To check
-                 * if commit message has a single line we have to make sure that the only
-                 * newline character found is in the end of commit message.
-                 */
+                // Git by default put newline character at the end of commit message. To check
+                // if commit message has a single line we have to make sure that the only
+                // newline character found is in the end of commit message.
                 final boolean isFoundNewLineCharacterAtTheEndOfMessage =
                         matcher.end() == commitMessage.length();
                 assertTrue(getInvalidCommitMessageFormattingError(commitId, commitMessage),