diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef4b45cd1..892a8431f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,16 @@ default:
   # All jobs are interruptible by default
   interruptible: true
 
+# see: https://docs.gitlab.com/ee/ci/yaml/#switch-between-branch-pipelines-and-merge-request-pipelines
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" # If we move to gitlab one day
+    - if: $CI_PIPELINE_SOURCE == "external_pull_request_event" # For github PR
+    - if: $CI_COMMIT_TAG # For tags
+    - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH  && $CI_PIPELINE_SOURCE == "push" # If it's not the default branch and if it's a push, then do not trigger a build
+      when: never
+    - when: always
+
 variables:
   YNH_BUILD_DIR: "ynh-build"
 
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml
index 308701475..c6c54ec20 100644
--- a/.gitlab/ci/test.gitlab-ci.yml
+++ b/.gitlab/ci/test.gitlab-ci.yml
@@ -58,69 +58,105 @@ test-helpers:
   script:
     - cd tests
     - bash test_helpers.sh
+  only:
+    changes:
+      - data/helpers.d/*
 
 test-apps:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_apps.py
+  only:
+    changes:
+      - src/yunohost/app.py
 
 test-appscatalog:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_appscatalog.py
+  only:
+    changes:
+      - src/yunohost/app.py
 
 test-appurl:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_appurl.py
+  only:
+    changes:
+      - src/yunohost/app.py
 
 test-apps-arguments-parsing:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_apps_arguments_parsing.py
-
-test-backuprestore:
-  extends: .test-stage
-  script:
-    - cd src/yunohost
-    - python3 -m pytest tests/test_backuprestore.py
+  only:
+    changes:
+      - src/yunohost/app.py
 
 test-changeurl:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_changeurl.py
+  only:
+    changes:
+      - src/yunohost/app.py
+
+test-backuprestore:
+  extends: .test-stage
+  script:
+    - cd src/yunohost
+    - python3 -m pytest tests/test_backuprestore.py
+  only:
+    changes:
+      - src/yunohost/backup.py
 
 test-permission:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_permission.py
+  only:
+    changes:
+      - src/yunohost/permission.py
 
 test-settings:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_settings.py
+  only:
+    changes:
+      - src/yunohost/settings.py
 
 test-user-group:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_user-group.py
-    
+  only:
+    changes:
+      - src/yunohost/user.py
+
 test-regenconf:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_regenconf.py
+  only:
+    changes:
+      - src/yunohost/regenconf.py
 
 test-service:
   extends: .test-stage
   script:
     - cd src/yunohost
     - python3 -m pytest tests/test_service.py
+  only:
+    changes:
+      - src/yunohost/service.py
\ No newline at end of file