diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9beb2871..8a85a803 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,8 +74,7 @@ test:
     - apt-get -y build-dep .
     - apt-get -y install clang-tidy
     - ninja -C _build test
-    - cd _build
-    - clang-tidy --checks=-clang-diagnostic-missing-braces,readability-braces-around-statements, --warnings-as-errors=readability-braces-around-statements -extra-arg=-Wno-unknown-warning-option ../src/*.c ../eek/*.c ../eekboard/*.c
+    - tools/style-check _build
 
 check_release:
   stage: test
diff --git a/tools/style-check b/tools/style-check
new file mode 100755
index 00000000..24c6dc81
--- /dev/null
+++ b/tools/style-check
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -z "$1" ]; then
+    echo "Please pass directory to check."
+    exit 1
+fi
+
+cd "$1"
+clang-tidy --checks=-clang-diagnostic-missing-braces,readability-braces-around-statements, \
+           --warnings-as-errors=readability-braces-around-statements \
+           -extra-arg=-Wno-unknown-warning-option \
+           ../src/*.c ../eek/*.c ../eekboard/*.c
+