diff --git a/.clang-tidy b/.clang-tidy
index e7e0830cfec5..3f2f2c054eb3 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,4 +1,4 @@
-Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,readability-identifier-naming'
+Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,readability-identifier-naming'
 CheckOptions:
   - key:             readability-identifier-naming.ClassCase
     value:           CamelCase
diff --git a/clang/.clang-tidy b/clang/.clang-tidy
index ed155786f36b..ba55beb095f5 100644
--- a/clang/.clang-tidy
+++ b/clang/.clang-tidy
@@ -1,5 +1,5 @@
 # Note that the readability-identifier-naming check is disabled, there are too
 # many violations in the codebase and they create too much noise in clang-tidy
 # results.
-Checks: '-readability-identifier-naming,-misc-no-recursion'
+Checks: '-readability-identifier-naming'
 InheritParentConfig: true
diff --git a/flang/.clang-tidy b/flang/.clang-tidy
index c0d51c8dbf5d..7eb4d259fba3 100644
--- a/flang/.clang-tidy
+++ b/flang/.clang-tidy
@@ -1,2 +1,2 @@
-Checks: '-llvm-include-order,-readability-identifier-naming,-misc-no-recursion,-clang-diagnostic-*'
+Checks: '-llvm-include-order,-readability-identifier-naming,-clang-diagnostic-*'
 InheritParentConfig: true
diff --git a/flang/include/flang/Lower/.clang-tidy b/flang/include/flang/Lower/.clang-tidy
index d2b773fc4b12..934c21cd6772 100644
--- a/flang/include/flang/Lower/.clang-tidy
+++ b/flang/include/flang/Lower/.clang-tidy
@@ -1,4 +1,4 @@
-Checks: 'readability-identifier-naming,llvm-include-order,misc-no-recursion,clang-diagnostic-*'
+Checks: 'readability-identifier-naming,llvm-include-order,clang-diagnostic-*'
 InheritParentConfig: true
 CheckOptions:
   - key:             readability-identifier-naming.MemberCase
diff --git a/flang/include/flang/Optimizer/.clang-tidy b/flang/include/flang/Optimizer/.clang-tidy
index d2b773fc4b12..934c21cd6772 100644
--- a/flang/include/flang/Optimizer/.clang-tidy
+++ b/flang/include/flang/Optimizer/.clang-tidy
@@ -1,4 +1,4 @@
-Checks: 'readability-identifier-naming,llvm-include-order,misc-no-recursion,clang-diagnostic-*'
+Checks: 'readability-identifier-naming,llvm-include-order,clang-diagnostic-*'
 InheritParentConfig: true
 CheckOptions:
   - key:             readability-identifier-naming.MemberCase
diff --git a/flang/lib/Lower/.clang-tidy b/flang/lib/Lower/.clang-tidy
index d2b773fc4b12..934c21cd6772 100644
--- a/flang/lib/Lower/.clang-tidy
+++ b/flang/lib/Lower/.clang-tidy
@@ -1,4 +1,4 @@
-Checks: 'readability-identifier-naming,llvm-include-order,misc-no-recursion,clang-diagnostic-*'
+Checks: 'readability-identifier-naming,llvm-include-order,clang-diagnostic-*'
 InheritParentConfig: true
 CheckOptions:
   - key:             readability-identifier-naming.MemberCase
diff --git a/flang/lib/Optimizer/.clang-tidy b/flang/lib/Optimizer/.clang-tidy
index d2b773fc4b12..934c21cd6772 100644
--- a/flang/lib/Optimizer/.clang-tidy
+++ b/flang/lib/Optimizer/.clang-tidy
@@ -1,4 +1,4 @@
-Checks: 'readability-identifier-naming,llvm-include-order,misc-no-recursion,clang-diagnostic-*'
+Checks: 'readability-identifier-naming,llvm-include-order,clang-diagnostic-*'
 InheritParentConfig: true
 CheckOptions:
   - key:             readability-identifier-naming.MemberCase