diff --git a/core/src/main/cpp/.clang-tidy b/core/src/main/cpp/.clang-tidy
index e77038ac..91b1c12c 100644
--- a/core/src/main/cpp/.clang-tidy
+++ b/core/src/main/cpp/.clang-tidy
@@ -12,9 +12,6 @@ Checks: >
   llvm-include-order,
   -modernize-use-trailing-return-type,
 
-# Turn all the warnings from the checks above into errors.
-WarningsAsErrors: "*"
-
 CheckOptions:
   - key:             readability-identifier-naming.ClassCase
     value:           CamelCase
@@ -62,3 +59,5 @@ CheckOptions:
     value:           1
   - key:             readability-implicit-bool-conversion.AllowPointerConditions
     value:           1
+  - key:             readability-braces-around-statements.ShortStatementLines
+    value:           1