diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f77aae3cab087ea8ce999548ad047e56d431778..fbbb114b8739d948d0ed3c787cb63f2c57be88a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,9 @@ stages:
   before_script:
     - apk add --no-cache bash build-base cmake python3 libexecinfo-dev cppunit-dev libxml2-dev tclap-dev readline-dev qt5-qtbase-dev graphviz-dev jsoncpp-dev ${EXTRA_PKGS}
     - export CXX=${CXX}
+  except:
+    variables:
+      - $SCHEDULED_NIGHTLY
 
 .build:compatibility: &build-compatibility
   <<: *build
@@ -131,6 +134,9 @@ build:doc:
   image: alpine:edge
   before_script:
     - apk add --no-cache bash bc coreutils python3 cmake make libexecinfo cppunit libxml2 tclap readline qt5-qtbase qt5-qtbase-x11 graphviz jsoncpp
+  except:
+    variables:
+      - $SCHEDULED_NIGHTLY
 
 .test:compatibility: &test-compatibility
   <<: *test
diff --git a/extra/docker/Dockerfile.master b/extra/docker/Dockerfile.master
index dfa68ebf2e7968fdf301add464a973dc966573fb..8cc8a5c22d38dd0fe5d431a3e7aea9f9d9e8910c 100644
--- a/extra/docker/Dockerfile.master
+++ b/extra/docker/Dockerfile.master
@@ -30,7 +30,7 @@ RUN	cmake \
 		-DCMAKE_INSTALL_PREFIX=$BASEDIR/install \
 		.. && \
 	make -j $(grep -c processor /proc/cpuinfo) && \
-	make test && \
+	make test ARGS="-j $(grep -c processor /proc/cpuinfo)" && \
 	make install
 
 
diff --git a/extra/docker/Dockerfile.master-cli b/extra/docker/Dockerfile.master-cli
index 2caa3c6ddae62eda872a66a65dc720da09cfd50f..15d8ed599c6549d46d59d68c4c90e68bdca4a949 100644
--- a/extra/docker/Dockerfile.master-cli
+++ b/extra/docker/Dockerfile.master-cli
@@ -27,7 +27,7 @@ RUN	cmake \
 		-DCMAKE_INSTALL_PREFIX=$BASEDIR/install \
 		.. && \
 	make -j $(grep -c processor /proc/cpuinfo) && \
-	make test && \
+	make test ARGS="-j $(grep -c processor /proc/cpuinfo)" && \
 	make install