diff --git a/.clang-tidy b/.clang-tidy
index c6777357ec1..11f6955f152 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -9,10 +9,36 @@ Checks: '-*,
   performance-*,
   -performance-unnecessary-copy-initialization,
   -performance-unnecessary-value-param,
-  google-build-namespaces,
-  google-build-explicit-make-pair,
+  google-*,
+  -google-build-using-namespace,
+  -google-default-arguments,
+  -google-explicit-constructor,
+  -google-global-names-in-headers,
+  -google-readability-braces-around-statements,
+  -google-readability-casting,
+  -google-readability-todo,
+  -google-runtime-int,
+  -google-runtime-references,
+  -misc-definitions-in-headers,
+  misc-static-assert,
+  misc-unconventional-assign-operator,
+  misc-uniqueptr-reset-release,
+  misc-unused-alias-decls,
+  -misc-unused-using-decls,
+  -modernize-make-unique,
+  -modernize-redundant-void-arg,
+  modernize-replace-auto-ptr,
+  modernize-shrink-to-fit,
+  -modernize-use-bool-literals,
   modernize-use-nullptr,
-  readability-function-size'
+  -modernize-use-override,
+  -readability-container-size-empty,
+  readability-deleted-default,
+  readability-function-size,
+  -readability-inconsistent-declaration-parameter-name,
+  -readability-redundant-control-flow,
+  -readability-redundant-smartptr-get,
+  -readability-string-compare'
 WarningsAsErrors: '*'
 CheckOptions:
   - key:    readability-function-size.StatementThreshold