diff --git a/examples/build-test-deploy-ansible.yml b/examples/build-test-deploy-ansible.yml
index 53e6a3c99d24dca74532bdb23c872b626ed0119f..36b8b771cdb3d6f8cf6612cfbebe2a6291365de5 100644
--- a/examples/build-test-deploy-ansible.yml
+++ b/examples/build-test-deploy-ansible.yml
@@ -34,14 +34,14 @@ Build Theme:
 Test Code Style:
   extends: '.codestyle'
 
-#Test PHPUnit:
-#  extends: '.phpunit'
+Test PHPUnit:
+  extends: '.phpunit'
 
-#Test Behat:
-#  extends: '.behat'
+Test Behat:
+  extends: '.behat'
 
-#Test Backstop:
-#  extends: '.backstop'
+Test Backstop:
+  extends: '.backstop'
 
 Deploy:
   extends: '.deployartefact'
diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index ead296d9b3e574c0ceb08e6d277d7e9df84e7e69..7398fc9e0313bcc0f9f242b4bf2b82520b72547f 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -307,6 +307,7 @@ stages:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
       - $CAE
       - $DISABLE_CI_TESTS
+      - $DISABLE_CI_TEST_CODESTYLE
 
 .phpunit:
   stage: test
@@ -336,6 +337,7 @@ stages:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
       - $CAE
       - $DISABLE_CI_TESTS
+      - $DISABLE_CI_TEST_PHPUNIT
 
 .behat:
   stage: test
@@ -366,6 +368,7 @@ stages:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
       - $CAE
       - $DISABLE_CI_TESTS
+      - $DISABLE_CI_TEST_BEHAT
 
 .backstop:
   stage: test
@@ -391,6 +394,7 @@ stages:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
       - $CAE
       - $DISABLE_CI_TESTS
+      - $DISABLE_CI_TEST_BACKSTOP
 
 .deploy:
   stage: deploy