diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 655d1b931..28ce12ce8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,12 @@
 **What I did**
 
 **Related issue**
-<-- If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" -->
+<!-- If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" -->
+
+<!-- optional tests
+You can add a @ mention to run tests executed by default only on main branch : 
+* `test-aci` to run ACI E2E tests
+* `test-windows` to run tests & E2E tests on windows
+-->
 
 **(not mandatory) A picture of a cute animal, if possible in relation with what you did**
diff --git a/.github/workflows/main-ci.yml b/.github/workflows/optional-ci.yml
similarity index 65%
rename from .github/workflows/main-ci.yml
rename to .github/workflows/optional-ci.yml
index 447336815..2cfe99081 100644
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/optional-ci.yml
@@ -4,13 +4,36 @@ on:
   push:
     branches:
       - main
+  pull_request:
 
 jobs:
+  check-optional-tests:
+    name: Check if needs to run ACI or Windows tests
+    runs-on: ubuntu-latest
+    outputs:
+      trigger-aci: ${{steps.runacitest.outputs.triggered}}
+      trigger-windows: ${{steps.runwindowstest.outputs.triggered}}
+    steps:
+      - uses: khan/pull-request-comment-trigger@master
+        name: Check if test ACI
+        if: github.event_name == 'pull_request'
+        id: runacitest
+        with:
+          trigger: '@test-aci'
+      - uses: khan/pull-request-comment-trigger@master
+        name: Check if test Windows
+        if: github.event_name == 'pull_request'
+        id: runwindowstest
+        with:
+          trigger: '@test-windows'
+
   build:
     name: ACI e2e tests
     runs-on: ubuntu-latest
     env:
       GO111MODULE: "on"
+    needs: check-optional-tests
+    if: github.ref == 'refs/heads/main' || needs.check-optional-tests.outputs.trigger-aci == 'true'
     steps:
       - name: Set up Go 1.14
         uses: actions/setup-go@v1
@@ -41,6 +64,8 @@ jobs:
     runs-on: windows-latest
     env:
       GO111MODULE: "on"
+    needs: check-optional-tests
+    if: github.ref == 'refs/heads/main' || needs.check-optional-tests.outputs.trigger-windows == 'true'
     steps:
       - name: Set up Go 1.14
         uses: actions/setup-go@v1