diff --git a/.gitlab-ci-checkcommit.sh b/.gitlab-ci-checkcommit.sh
new file mode 100755
index 0000000..9023410
--- /dev/null
+++ b/.gitlab-ci-checkcommit.sh
@@ -0,0 +1,9 @@
+#! /usr/bin/env bash
+
+git fetch https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer.git
+
+git diff -U0 --no-color FETCH_HEAD...HEAD -- | clang-format-diff-5.0 -p 1 -style=file > format-fixup.patch
+if [ -s format-fixup.patch ]; then
+	cat format-fixup.patch
+	exit 1
+fi
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24c4a0a..d0175f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,9 @@
 stages:
   - style
 
-clang-format:
+checkstyle:
   stage: style
-  script:
-    - git fetch https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer.git
-    - git diff -U0 --no-color FETCH_HEAD...HEAD -- | clang-format-diff-5.0 -p 1 -style=file > format-fixup.patch
-    - if [ -s format-fixup.patch ]; then cat format-fixup.patch && exit 1; fi
+  script: "./.gitlab-ci-checkcommit.sh"
   artifacts:
     when: on_failure
     paths: