diff --git a/shared/config/checkstyle/checkstyle-non-fatal.xml b/shared/config/checkstyle/checkstyle-non-fatal.xml
index 9e8496ebb3..dff679e6fd 100644
--- a/shared/config/checkstyle/checkstyle-non-fatal.xml
+++ b/shared/config/checkstyle/checkstyle-non-fatal.xml
@@ -147,6 +147,24 @@
             <property name="severity" value="warning" />
         </module>
 
+        <!--
+            Source code comment-based suppressions
+        -->
+        <module name="SuppressionCommentFilter">
+            <!--
+                Allow a finalize() method within these comments.  DriverManagerConnectionProviderImpl e.g.
+                uses a finalizer to make sure we release all of its cached connections.
+            -->
+            <property name="offCommentFormat" value="CHECKSTYLE:START_ALLOW_FINALIZER"/>
+            <property name="onCommentFormat" value="CHECKSTYLE:END_ALLOW_FINALIZER"/>
+            <property name="checkFormat" value="NoFinalizer"/>
+        </module>
+
+        <module name="SuppressWithNearbyCommentFilter">
+            <property name="commentFormat" value="noinspection StatementWithEmptyBody"/>
+            <property name="checkFormat" value="EmptyStatement"/>
+            <property name="influenceFormat" value="1"/>
+        </module>
     </module>
 
     <module name="JavadocPackage">
@@ -165,23 +183,4 @@
         </module>
     </module>
 
-
-    <!--
-        Source code comment-based suppressions
-    -->
-    <module name="SuppressionCommentFilter">
-        <!--
-            Allow a finalize() method within these comments.  DriverManagerConnectionProviderImpl e.g.
-            uses a finalizer to make sure we release all of its cached connections.
-        -->
-        <property name="offCommentFormat" value="CHECKSTYLE:START_ALLOW_FINALIZER"/>
-        <property name="onCommentFormat" value="CHECKSTYLE:END_ALLOW_FINALIZER"/>
-        <property name="checkFormat" value="NoFinalizer"/>
-    </module>
-
-    <module name="SuppressWithNearbyCommentFilter">
-        <property name="commentFormat" value="noinspection StatementWithEmptyBody"/>
-        <property name="checkFormat" value="EmptyStatement"/>
-        <property name="influenceFormat" value="1"/>
-    </module>
 </module>
diff --git a/shared/config/checkstyle/checkstyle.xml b/shared/config/checkstyle/checkstyle.xml
index eafc2734d0..ca5530643e 100644
--- a/shared/config/checkstyle/checkstyle.xml
+++ b/shared/config/checkstyle/checkstyle.xml
@@ -61,6 +61,24 @@
             <property name="illegalPkgs" value="java.awt, sun, org.slf4j"/>
         </module>
 
+        <!--
+            Source code comment-based suppressions
+        -->
+        <module name="SuppressionCommentFilter">
+            <!--
+                Allow a finalize() method within these comments.  DriverManagerConnectionProviderImpl e.g.
+                uses a finalizer to make sure we release all of its cached connections.
+            -->
+            <property name="offCommentFormat" value="CHECKSTYLE:START_ALLOW_FINALIZER"/>
+            <property name="onCommentFormat" value="CHECKSTYLE:END_ALLOW_FINALIZER"/>
+            <property name="checkFormat" value="NoFinalizer"/>
+        </module>
+
+        <module name="SuppressWithNearbyCommentFilter">
+            <property name="commentFormat" value="noinspection StatementWithEmptyBody"/>
+            <property name="checkFormat" value="EmptyStatement"/>
+            <property name="influenceFormat" value="1"/>
+        </module>
     </module>
 
     <!-- We are not using NewLineAtEndOfFile because the new line chars change
@@ -77,23 +95,4 @@
         <property name="message" value="Files should end with no more than 5 (empty) new lines" />
     </module>
 
-
-    <!--
-        Source code comment-based suppressions
-    -->
-    <module name="SuppressionCommentFilter">
-        <!--
-            Allow a finalize() method within these comments.  DriverManagerConnectionProviderImpl e.g.
-            uses a finalizer to make sure we release all of its cached connections.
-        -->
-        <property name="offCommentFormat" value="CHECKSTYLE:START_ALLOW_FINALIZER"/>
-        <property name="onCommentFormat" value="CHECKSTYLE:END_ALLOW_FINALIZER"/>
-        <property name="checkFormat" value="NoFinalizer"/>
-    </module>
-
-    <module name="SuppressWithNearbyCommentFilter">
-        <property name="commentFormat" value="noinspection StatementWithEmptyBody"/>
-        <property name="checkFormat" value="EmptyStatement"/>
-        <property name="influenceFormat" value="1"/>
-    </module>
 </module>