diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9e5862cab..6522eded9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -544,7 +544,7 @@ jobs:
     environment:
       CC: clang
       CXX: clang++
-      CMAKE_OPTIONS: -DSANITIZE=address
+      CMAKE_OPTIONS: -DSANITIZE=address  -DCMAKE_CXX_CLANG_TIDY=clang-tidy
       MAKEFLAGS: -j 3
     steps:
       - checkout
diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 000000000..b2c9eae59
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,19 @@
+Checks: >
+  bugprone-*,
+  cert-*,
+  -cert-err58-cpp,
+  clang-analyzer-*,
+  google-global-names-in-headers,
+  google-runtime-int,
+  misc-*,
+  -misc-non-private-member-variables-in-classes,
+  performance-*,
+  portability-*,
+  readability-*,
+  -readability-braces-around-statements,
+  -readability-implicit-bool-conversion,
+  -readability-magic-numbers,
+  -readability-uppercase-literal-suffix,
+
+WarningsAsErrors:  '*'
+FormatStyle:       file
\ No newline at end of file