diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c88998045..36e86de73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,7 +91,7 @@ fedora-x86_64:
   stage: build
   needs: []
   variables:
-    CFLAGS: "-coverage -ftest-coverage -fprofile-arcs -Wnonnull"
+    CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
   script:
     - meson ${MESON_COMMON_OPTIONS}
             --werror
@@ -139,8 +139,6 @@ debian-stable-x86_64:
   image: $DEBIAN_IMAGE
   stage: build
   needs: []
-  variables:
-    CFLAGS: "-Wnonnull"
   script:
     - meson ${MESON_COMMON_OPTIONS}
             --werror
diff --git a/meson.build b/meson.build
index 0edea24a9..30a65e873 100644
--- a/meson.build
+++ b/meson.build
@@ -477,6 +477,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
     '-Wduplicated-branches',
     '-Wimplicit-fallthrough',
     '-Wmisleading-indentation',
+    '-Wnonnull',
     '-Wunused',
     # Due to maintained deprecated code, we do not want to see unused parameters
     '-Wno-unused-parameter',