diff --git a/.clang-tidy b/.clang-tidy
index 0f2c5ed1..a9964efa 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -5,6 +5,8 @@ Checks: >-
   -*osx*,
   -abseil*,
   -android*,
+  -bugprone-branch-clone,
+  -bugprone-exception-escape,
   -clang-analyzer-alpha.*,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -cppcoreguidelines-macro-usage,
@@ -38,6 +40,7 @@ Checks: >-
   -readability-redundant-smartptr-get,
   -readability-convert-member-functions-to-static,
   -readability-function-cognitive-complexity,
+  -readability-const-return-type,
   -darwin*,
   -zircon*
 WarningsAsErrors: '*'
diff --git a/.gitignore b/.gitignore
index d82c22e2..d4b8e02b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ compile_commands.json
 CTestTestfile.cmake
 Session.vim
 _deps
+_tidy
 /build/
 lib/
 bin/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67ced306..373b82c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,5 +180,8 @@ install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
 #
 # Enable testing via CTest
 #
-enable_testing()
-add_subdirectory(tests)
+option(BUILD_TESTS "" ON)
+if(BUILD_TESTS)
+  enable_testing()
+  add_subdirectory(tests)
+endif(BUILD_TESTS)
\ No newline at end of file