diff --git a/utils/tests/gitlab-ci-test.yml b/utils/tests/gitlab-ci-test.yml
index 501071af1..055641e3f 100644
--- a/utils/tests/gitlab-ci-test.yml
+++ b/utils/tests/gitlab-ci-test.yml
@@ -11,14 +11,14 @@
     - mkdir -p $CCACHE_BASEDIR_VALUE
     - export CCACHE_BASEDIR=${PWD}
     - export CCACHE_DIR=${PWD}/$CCACHE_BASEDIR_VALUE
-    - CXX="ccache $COMPILER" ./waf configure --enable-examples --enable-tests -d $MODE
-    - ./test.py $VALGRIND $FULLNESS
+    - CXX="ccache $COMPILER" ./waf configure --enable-examples --enable-tests --disable-gtk --disable-python -d $MODE
+    - ./test.py $VALGRIND_FLAG $FULLNESS
   cache:
     paths:
       - $CCACHE_BASEDIR_VALUE/
   variables:
     CCACHE_BASEDIR_VALUE: ns-3-ccache-storage
-    VALGRIND: ""
+    VALGRIND_FLAG: ""
     FULLNESS: ""
 
 # Run the test.py script with files compiled in debug mode
@@ -71,7 +71,7 @@ weekly-test-debug:
   variables:
     COMPILER: g++
     MODE: debug
-    VALGRIND: -g
+    VALGRIND_FLAG: -g
   only:
     variables:
       - $RELEASE == "weekly"
@@ -89,7 +89,7 @@ weekly-test-release:
   variables:
     COMPILER: g++
     MODE: release
-    VALGRIND: -g
+    VALGRIND_FLAG: -g
   only:
     variables:
       - $RELEASE == "weekly"
@@ -107,7 +107,7 @@ weekly-test-optimized:
   variables:
     COMPILER: g++
     MODE: optimized
-    VALGRIND: -g
+    VALGRIND_FLAG: -g
   only:
     variables:
       - $RELEASE == "weekly"
diff --git a/utils/tests/gitlab-ci.yml b/utils/tests/gitlab-ci.yml
index 1dfa212a4..49d6362f2 100644
--- a/utils/tests/gitlab-ci.yml
+++ b/utils/tests/gitlab-ci.yml
@@ -39,6 +39,7 @@ stages:
     - export CCACHE_DIR=${PWD}/$CCACHE_BASEDIR_VALUE
     - CXX="ccache $COMPILER" ./waf configure --enable-examples --enable-tests -d $MODE
     - ./waf
+    - ./test.py
   cache:
     paths:
       - $CCACHE_BASEDIR_VALUE/
@@ -52,6 +53,8 @@ per-commit-compile-debug:
   except:
     variables:
       - $PYBINDGEN == "True"
+      - $RELEASE == "weekly"
+      - $RELEASE == "daily"
   image: archlinux/base
   variables:
     COMPILER: g++
@@ -65,6 +68,8 @@ per-commit-compile-release:
   except:
     variables:
       - $PYBINDGEN == "True"
+      - $RELEASE == "weekly"
+      - $RELEASE == "daily"
   image: archlinux/base
   variables:
     COMPILER: g++
@@ -78,6 +83,8 @@ per-commit-compile-optimized:
   except:
     variables:
       - $PYBINDGEN == "True"
+      - $RELEASE == "weekly"
+      - $RELEASE == "daily"
   image: archlinux/base
   variables:
     COMPILER: g++