diff --git a/script/install_analysis.sh b/script/install_analysis.sh
index 2ade9f228882..838a830d1a99 100755
--- a/script/install_analysis.sh
+++ b/script/install_analysis.sh
@@ -26,6 +26,11 @@ then
     travis_retry sudo apt-get -y --quiet --allow-unauthenticated --no-install-recommends install shellcheck
     shellcheck --version
 
+    #-------------------------------------------------------------------------------
+    # Install clang-tidy
+    travis_retry sudo apt-get -y --quiet --allow-unauthenticated --no-install-recommends install clang-tidy
+    clang-tidy --version
+
 elif [ "$ALPAKA_CI_OS_NAME" = "macOS" ]
 then
     #-------------------------------------------------------------------------------
@@ -38,4 +43,9 @@ then
     brew install shellcheck
     shellcheck --version
 
+    #-------------------------------------------------------------------------------
+    # Install clang-tidy
+    brew install clang-tidy
+    clang-tidy --version
+
 fi
diff --git a/script/run_analysis.sh b/script/run_analysis.sh
index add4b0623218..45543673422a 100755
--- a/script/run_analysis.sh
+++ b/script/run_analysis.sh
@@ -27,4 +27,8 @@ then
     #-------------------------------------------------------------------------------
     # check shell script with shellcheck
     find . -type f -name "*.sh" -exec shellcheck {} \;
+
+    #-------------------------------------------------------------------------------
+    # clang-tidy
+    run-clang-tidy -header-filter='(tests|include/alpaka|examples)' '^(?!.*'$PWD').*$'
 fi
diff --git a/script/run_generate.sh b/script/run_generate.sh
index 3ebf87b038cc..533cd41c08a1 100755
--- a/script/run_generate.sh
+++ b/script/run_generate.sh
@@ -86,7 +86,7 @@ mkdir -p build/
 cd build/
 
 "${ALPAKA_CI_CMAKE_EXECUTABLE}" --log-level=VERBOSE -G "${ALPAKA_CI_CMAKE_GENERATOR}" ${ALPAKA_CI_CMAKE_GENERATOR_PLATFORM}\
-    -Dalpaka_BUILD_EXAMPLES=ON -DBUILD_TESTING=ON \
+    -Dalpaka_BUILD_EXAMPLES=ON -DBUILD_TESTING=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
     "$(env2cmake BOOST_ROOT)" -DBOOST_LIBRARYDIR="${ALPAKA_CI_BOOST_LIB_DIR}/lib" -DBoost_USE_STATIC_LIBS=ON -DBoost_USE_MULTITHREADED=ON -DBoost_USE_STATIC_RUNTIME=OFF -DBoost_ARCHITECTURE="-x64" \
     "$(env2cmake CMAKE_BUILD_TYPE)" "$(env2cmake CMAKE_CXX_FLAGS)" "$(env2cmake CMAKE_C_COMPILER)" "$(env2cmake CMAKE_CXX_COMPILER)" "$(env2cmake CMAKE_EXE_LINKER_FLAGS)" "$(env2cmake CMAKE_CXX_EXTENSIONS)"\
     "$(env2cmake alpaka_ACC_CPU_B_SEQ_T_SEQ_ENABLE)" "$(env2cmake alpaka_ACC_CPU_B_SEQ_T_THREADS_ENABLE)" "$(env2cmake alpaka_ACC_CPU_B_SEQ_T_FIBERS_ENABLE)" \