diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5447c9cfa278085b334864b35013bb47e1d3280f..b471ba38f67f5cf29849ba5724870c004c3e70ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,10 +51,9 @@ test:debian-jessie-aegir3-apt:
   image: debian:jessie
   dependencies:
     - build:deb
-  only:
-    - 7.x-3.x
-    - /^7\.x-3\.\d+\.x/
-    - 2915491-ubuntu-mariadb
+  when: manual
+  except:
+     - 7.x-3.x
 
   before_script:
     - apt-get update
@@ -86,10 +85,10 @@ test:ubuntu-xenial-aegir3-apt:
   image: ubuntu:xenial
   dependencies:
     - build:deb
-  only:
-    - 7.x-3.x
-    - /^7\.x-3\.\d+\.x/
-    - 2915491-ubuntu-mariadb
+
+  when: manual
+  except:
+     - 7.x-3.x
 
   before_script:
     - apt-get update