diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f779f42ec4..24b9857529 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ stages:
   before_script:
     - ./autogen.sh
   script:
-    - ./configure --with-libtool
+    - ./configure --with-libtool --disable-static
     - make -j6 -k all V=1
   artifacts:
     expire_in: '1 hour'
@@ -96,27 +96,35 @@ stages:
   before_script:
     - bash -x bin/tests/system/ifconfig.sh up
   script:
-    - make -j6 -k check V=1
+    - make -j8 -k check V=1
   artifacts:
     untracked: true
     expire_in: '1 week'
     when: on_failure
 
-build:debian:jessie:amd64:
-  <<: *debian_jessie_amd64_image
-  <<: *build_job
-
-build:debian:jessie:i386:
-  <<: *debian_jessie_i386_image
-  <<: *build_job
-
-build:debian:stretch:amd64:
-  <<: *debian_stretch_amd64_image
-  <<: *build_job
-
-build:debian:buster:i386:
-  <<: *debian_buster_i386_image
-  <<: *build_job
+#build:debian:jessie:amd64:
+#  <<: *debian_jessie_amd64_image
+#  <<: *build_job
+#
+#build:debian:jessie:i386:
+#  <<: *debian_jessie_i386_image
+#  <<: *build_job
+#
+#build:debian:stretch:amd64:
+#  <<: *debian_stretch_amd64_image
+#  <<: *build_job
+#
+#build:debian:buster:i386:
+#  <<: *debian_buster_i386_image
+#  <<: *build_job
+#
+#build:ubuntu:trusty:amd64:
+#  <<: *ubuntu_trusty_amd64_image
+#  <<: *build_job
+#
+#build:ubuntu:xenial:i386:
+#  <<: *ubuntu_xenial_i386_image
+#  <<: *build_job
 
 build:debian:sid:amd64:
   <<: *debian_sid_amd64_image
@@ -137,11 +145,3 @@ test:debian:sid:i386:
   <<: *test_job
   dependencies:
     - build:debian:sid:i386
-
-build:ubuntu:trusty:amd64:
-  <<: *ubuntu_trusty_amd64_image
-  <<: *build_job
-
-build:ubuntu:xenial:i386:
-  <<: *ubuntu_xenial_i386_image
-  <<: *build_job
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index ffb5ef4a1f..0c2ecfda3a 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -36,6 +36,8 @@ SUBDIRS =	atomic db dst master mem hashes names \
 		net rbt resolver sockaddr tasks timers system \
 		@PKCS11_TOOLS@
 
+TESTDIRS =	system
+
 # Test programs that are built by default:
 # cfg_test is needed for regenerating doc/misc/options
 # makejournal is needed by system tests
@@ -282,7 +284,7 @@ clean distclean::
 check: test
 
 test:
-	@for dir in $(SUBDIRS) ;\
+	@for dir in $(TESTDIRS) ;\
 	do \
 		( cd $$dir; $(MAKE) test ) ;\
 	done