diff --git a/.clang-tidy b/.clang-tidy
index f4dc9cabc5..026d78fa12 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -6,11 +6,5 @@ Checks: >
   -clang-analyzer-cplusplus.NewDeleteLeaks,
   -clang-analyzer-core.CallAndMessage,
   -modernize-avoid-bind
-WarningsAsErrors: >
-  -*,
-  portability-*,
-  clang-analyzer-*,
-  -clang-analyzer-optin*,
-  -clang-analyzer-cplusplus.NewDeleteLeaks,
-  -clang-analyzer-core.CallAndMessage
+WarningsAsErrors: '*'
 HeaderFilterRegex: '(apps|components)/'
diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 2589c2807e..c6fd306e25 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -38,7 +38,7 @@ fi
 
 if [[ $CI_CLANG_TIDY ]]; then
     CMAKE_CONF_OPTS+=(
-        -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--warnings-as-errors=*"
+        -DCMAKE_CXX_CLANG_TIDY=clang-tidy
         -DBUILD_COMPONENTS_TESTS=ON
         -DBUILD_OPENMW_TESTS=ON
         -DBUILD_OPENCS_TESTS=ON