diff --git a/checkstyle.xml b/checkstyle.xml
index c61b92247..af8c5480f 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -154,6 +154,10 @@
         <module name="MultipleVariableDeclarations"/>
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
+        <module name="FinalLocalVariable">
+            <property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>
+            <property name="validateEnhancedForLoopVariable" value="true"/>
+        </module>
 
         <!-- Checks for class design                         -->
         <!-- See https://checkstyle.org/config_design.html -->