diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50e6155d5e5bb6c535ccb821c584994dc97bf177..b59b583fa232504bb9615a2c2dcd9b0e16c36451 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,10 +67,10 @@ test:debian-jessie-aegir3-apt:
   image: debian:jessie
   dependencies:
     - build:deb
-  when: manual
-  except:
+  only:
     - 7.x-3.x
     - /^7\.x-3\.\d+\.x/
+    - /-runalltests$/
 
   before_script:
     - apt-get update
@@ -103,10 +103,10 @@ test:ubuntu-xenial-aegir3-apt:
   dependencies:
     - build:deb
 
-  when: manual
-  except:
+  only:
     - 7.x-3.x
     - /^7\.x-3\.\d+\.x/
+    - /-runalltests$/
 
   before_script:
     - apt-get update
@@ -123,10 +123,10 @@ test:ubuntu-artful-aegir3-apt:
   dependencies:
     - build:deb
 
-  when: manual
-  except:
+  only:
     - 7.x-3.x
     - /^7\.x-3\.\d+\.x/
+    - /-runalltests$/
 
   before_script:
     - apt-get update