diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 000000000..9782cf4e5
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,14 @@
+Checks: '-*,
+    modernize-make-shared,
+    modernize-replace-*,
+    modernize-shrink-to-fit,
+    modernize-use-bool-literals,
+    modernize-use-emplace,
+    modernize-use-noexcept,
+    modernize-use-transparent-functors,
+    modernize-use-uncaught-exceptions,
+'
+WarningsAsErrors: '*'
+HeaderFilterRegex: '.*'
+AnalyzeTemporaryDtors: false
+FormatStyle:     none
diff --git a/.drone.yml b/.drone.yml
index b07be40b0..78b525637 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -83,11 +83,15 @@ steps:
       export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
       mkdir build &&
       cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
+      cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
       make &&
       useradd -m -s /bin/bash test &&
       chown -R test:test . &&
       su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
+    # Static analysis with clang-tidy
+    - /bin/bash -c "
+      ln -s build/compile_commands.json . &&
+      run-clang-tidy-6.0"
 trigger:
   branch:
     - master