diff --git a/.clang-tidy b/.clang-tidy
index c4ec53ab0..f6f753661 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,9 +1,10 @@
 ---
-Checks: '*,-android-cloexec-*,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-no-recursion,-modernize-make-unique,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
+Checks: '*,-android-cloexec-*,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-no-recursion,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
 #
 #  cppcoreguidelines-pro-type-cstyle-cast
 #  google-build-using-namespace
 #  google-readability-casting
+#  llvm-header-guard
 #  llvm-include-order
 #  hicpp-named-parameter
 #  readability-named-parameter
@@ -18,6 +19,11 @@ Checks: '*,-android-cloexec-*,-cppcoreguidelines-avoid-magic-numbers,-cppcoregui
 #    it for the time being because with it we can't see the forest for the
 #    trees. (TODO)
 #
+#  cppcoreguidelines-avoid-non-const-global-variables
+#    Not wrong to avoid those, but we have a few that are hard to avoid.
+#    Also this warning is triggered many times by constructs in the Catch test
+#    framework.
+#
 #  cppcoreguidelines-owning-memory
 #  cppcoreguidelines-pro-bounds-array-to-pointer-decay
 #  cppcoreguidelines-pro-bounds-pointer-arithmetic
@@ -33,18 +39,12 @@ Checks: '*,-android-cloexec-*,-cppcoreguidelines-avoid-magic-numbers,-cppcoregui
 #  google-readability-todo
 #    We are not that organized
 #
-#  llvm-header-guard
-#    Not our style
-#
 #  llvmlibc-*
 #    Not applicable
 #
 #  misc-no-recursion
 #    Nothing wrong with recursion
 #
-#  modernize-make-unique
-#    Not available in C++11
-#
 #  modernize-use-trailing-return-type
 #    We are not that modern...
 #
@@ -58,4 +58,8 @@ CheckOptions:
       value: true
     - key: hicpp-special-member-functions.AllowSoleDefaultDtor
       value: true
+    - key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
+      value: true
+    - key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
+      value: true
 ...