diff --git a/its/ruling/src/test/resources/commons-beanutils/java-S1488.json b/its/ruling/src/test/resources/commons-beanutils/java-S1488.json
index 63a28e3c7ca..44950c34791 100644
--- a/its/ruling/src/test/resources/commons-beanutils/java-S1488.json
+++ b/its/ruling/src/test/resources/commons-beanutils/java-S1488.json
@@ -9,4 +9,24 @@
 528,
 570
 ],
+"commons-beanutils:commons-beanutils:src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java": [
+986
+],
+"commons-beanutils:commons-beanutils:src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java": [
+181,
+208,
+226
+],
+"commons-beanutils:commons-beanutils:src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java": [
+1237
+],
+"commons-beanutils:commons-beanutils:src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java": [
+2614
+],
+"commons-beanutils:commons-beanutils:src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java": [
+150
+],
+"commons-beanutils:commons-beanutils:src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java": [
+528
+]
 }
diff --git a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S127.json b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S127.json
index cff9a19be48..2d6e8b2a5a3 100644
--- a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S127.json
+++ b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S127.json
@@ -21,10 +21,6 @@
 "org.eclipse.jetty:jetty-project:jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java": [
 183
 ],
-"org.eclipse.jetty:jetty-project:jetty-http/src/test/java/org/eclipse/jetty/http/GZIPContentDecoderTest.java": [
-381,
-395
-],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java": [
 81
 ]
diff --git a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1488.json b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1488.json
index a98ad66bfa0..d09c0cd6bc1 100644
--- a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1488.json
+++ b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1488.json
@@ -14,4 +14,7 @@
 187,
 194
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/test/java/org/eclipse/jetty/server/HttpOutputTest.java": [
+177
+]
 }
diff --git a/its/ruling/src/test/resources/eclipse-jetty/java-S127.json b/its/ruling/src/test/resources/eclipse-jetty/java-S127.json
index 3d799d8a3a0..e15c95bef60 100644
--- a/its/ruling/src/test/resources/eclipse-jetty/java-S127.json
+++ b/its/ruling/src/test/resources/eclipse-jetty/java-S127.json
@@ -21,10 +21,6 @@
 "org.eclipse.jetty:jetty-project:jetty-http/src/main/java/org/eclipse/jetty/http/QuotedQualityCSV.java": [
 183
 ],
-"org.eclipse.jetty:jetty-project:jetty-http/src/test/java/org/eclipse/jetty/http/GZIPContentDecoderTest.java": [
-381,
-395
-],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java": [
 81
 ],
@@ -66,8 +62,5 @@
 ],
 "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/security/Password.java": [
 182
-],
-"org.eclipse.jetty:jetty-project:jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java": [
-570
 ]
 }
diff --git a/its/ruling/src/test/resources/eclipse-jetty/java-S1488.json b/its/ruling/src/test/resources/eclipse-jetty/java-S1488.json
index 73abf7478be..d06ea2fdc0c 100644
--- a/its/ruling/src/test/resources/eclipse-jetty/java-S1488.json
+++ b/its/ruling/src/test/resources/eclipse-jetty/java-S1488.json
@@ -14,7 +14,16 @@
 187,
 194
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/test/java/org/eclipse/jetty/server/HttpOutputTest.java": [
+177
+],
 "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarResource.java": [
 131
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java": [
+53
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java": [
+93
 ]
 }
diff --git a/its/ruling/src/test/resources/sonar-server/java-S1488.json b/its/ruling/src/test/resources/sonar-server/java-S1488.json
new file mode 100644
index 00000000000..92cbedd4765
--- /dev/null
+++ b/its/ruling/src/test/resources/sonar-server/java-S1488.json
@@ -0,0 +1,17 @@
+{
+"org.sonarsource.sonarqube:sonar-server:src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java": [
+207
+],
+"org.sonarsource.sonarqube:sonar-server:src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java": [
+132
+],
+"org.sonarsource.sonarqube:sonar-server:src/test/java/org/sonar/server/issue/ws/AssignActionTest.java": [
+268
+],
+"org.sonarsource.sonarqube:sonar-server:src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java": [
+120
+],
+"org.sonarsource.sonarqube:sonar-server:src/test/java/org/sonar/server/permission/ws/template/SearchTemplatesActionTest.java": [
+65
+]
+}
diff --git a/sonar-java-plugin/src/main/java/org/sonar/plugins/java/CheckList.java b/sonar-java-plugin/src/main/java/org/sonar/plugins/java/CheckList.java
index ba95ec80679..a3c7018e522 100644
--- a/sonar-java-plugin/src/main/java/org/sonar/plugins/java/CheckList.java
+++ b/sonar-java-plugin/src/main/java/org/sonar/plugins/java/CheckList.java
@@ -849,6 +849,7 @@ public final class CheckList {
     FinalClassCheck.class,
     FinalizeFieldsSetCheck.class,
     FloatEqualityCheck.class,
+    ForLoopCounterChangedCheck.class,
     ForLoopFalseConditionCheck.class,
     ForLoopIncrementAndUpdateCheck.class,
     ForLoopIncrementSignCheck.class,
@@ -1200,7 +1201,6 @@ public final class CheckList {
     CollectionIsEmptyCheck.class,
     CompareObjectWithEqualsCheck.class,
     StringConcatenationInLoopCheck.class,
-    ImmediatelyReturnedVariableCheck.class,
     DisallowedThreadGroupCheck.class,
     ClassVariableVisibilityCheck.class,
     PublicStaticFieldShouldBeFinalCheck.class,
@@ -1308,8 +1308,8 @@ public final class CheckList {
     EmptyMethodsCheck.class,
     EmptyStatementUsageCheck.class,
     FixmeTagPresenceCheck.class,
-    ForLoopCounterChangedCheck.class,
     HiddenFieldCheck.class,
+    ImmediatelyReturnedVariableCheck.class,
     LambdaOptionalParenthesisCheck.class,
     MethodIdenticalImplementationsCheck.class,
     MethodNameSameAsClassCheck.class,