diff --git a/ci/validates.gitlab-ci.yml b/ci/validates.gitlab-ci.yml
index 85a611163acf06a753aab3f128d0beab0582d7ec..54ce70a07659bafd2681d8883b8249bbbec83459 100644
--- a/ci/validates.gitlab-ci.yml
+++ b/ci/validates.gitlab-ci.yml
@@ -1,4 +1,4 @@
-validate:shellscripts:
+validate:shellscripts:lint:
   stage: validate
   image: gitlab-registry.mpcdf.mpg.de/tbz/ci_tools:latest
   before_script:
@@ -8,6 +8,16 @@ validate:shellscripts:
     - shellcheck tests/dnf-automatic-mock
   allow_failure: true
 
+validate:shellscripts:format:
+  stage: validate
+  image: gitlab-registry.mpcdf.mpg.de/tbz/ci_tools:latest
+  before_script:
+    - shfmt --version
+  script:
+    - shfmt -i 2 -d script/check_dnf_automatic
+    - shfmt -i 2 -d tests/dnf-automatic-mock
+  allow_failure: true
+
 validate:specfile:
   stage: validate
   before_script: