diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index bc83e4500..eeb5ab984 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -318,6 +318,7 @@
     <module name="ModifiedControlVariable"/>
     <module name="AvoidInlineConditionals"/>
     <module name="IllegalType"/>
+    <module name="TrailingComment"/>
 
 <!--
     <module name="ClassDataAbstractionCoupling"/>
@@ -334,7 +335,6 @@
     <module name="OneTopLevelClass"/>
     <module name="OverloadMethodsDeclarationOrder"/>
     <module name="PackageDeclaration"/>
-    <module name="TrailingComment"/>
     <module name="RequireThis"/>
     <module name="ReturnCount"/>
     <module name="SingleLineJavadoc"/>
diff --git a/config/suppressions.xml b/config/suppressions.xml
index 80ddbc8fa..51156f1b7 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -63,4 +63,8 @@
 
     <!-- Should be solved after fixing https://github.com/checkstyle/checkstyle/issues/1805 -->
     <suppress checks="IllegalType" files=".*[\\/]src[\\/]test[\\/]|(AbstractTypeAwareCheck|TryHandler|SlistHandler|PrimordialHandler|MethodCallHandler|MemberDefHandler|IndentationCheck|IfHandler|HandlerFactory|CaseHandler|BlockParentHandler|AbstractExpressionHandler|JavadocMethodCheck|DetectorOptions)\.java"/>
+
+    <!-- Till https://github.com/checkstyle/checkstyle/issues/1854 -->
+    <suppress checks="TrailingComment" files="(InnerAssignmentCheck\.java|OperatorWrapCheck\.java|XMLLoggerTest\.java|AbbreviationAsWordInNameCheckTest\.java)"/>
+
 </suppressions>