diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1e917c..c10d39d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,10 +27,42 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3','7.4']
-        moodle-branch: ['MOODLE_39_STABLE', 'MOODLE_310_STABLE', 'MOODLE_311_STABLE']
+        php: ['7.1', '7.2', '7.3', '7.4']
+        moodle-branch: ['MOODLE_35_STABLE', 'MOODLE_36_STABLE', 'MOODLE_37_STABLE', 'MOODLE_38_STABLE', 'MOODLE_39_STABLE', 'MOODLE_310_STABLE', 'MOODLE_311_STABLE']
         database: [pgsql]
-
+        exclude:
+          # Exclude Moodle+PHP incompatible versions
+          # See: https://docs.moodle.org/dev/Moodle_and_PHP
+          - moodle-branch: 'MOODLE_36_STABLE'
+            php: '7.1'
+          - moodle-branch: 'MOODLE_37_STABLE'
+            php: '7.1'
+          - moodle-branch: 'MOODLE_38_STABLE'
+            php: '7.1'
+          - moodle-branch: 'MOODLE_39_STABLE'
+            php: '7.1'
+          - moodle-branch: 'MOODLE_310_STABLE'
+            php: '7.1'
+          - moodle-branch: 'MOODLE_311_STABLE'
+            php: '7.1'
+          - moodle-branch: 'MOODLE_36_STABLE'
+            php: '7.2'
+          - moodle-branch: 'MOODLE_37_STABLE'
+            php: '7.2'
+          - moodle-branch: 'MOODLE_311_STABLE'
+            php: '7.2'
+          - moodle-branch: 'MOODLE_35_STABLE'
+            php: '7.3'
+          - moodle-branch: 'MOODLE_36_STABLE'
+            php: '7.3'
+          - moodle-branch: 'MOODLE_37_STABLE'
+            php: '7.3'
+          - moodle-branch: 'MOODLE_35_STABLE'
+            php: '7.4'
+          - moodle-branch: 'MOODLE_36_STABLE'
+            php: '7.4'
+          - moodle-branch: 'MOODLE_37_STABLE'
+            php: '7.4'
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
@@ -56,7 +88,7 @@ jobs:
       - name: Add filter & commons qtype
         run: |
           moodle-plugin-ci add-plugin wiris/moodle-filter_wiris
-          moodle-plugin-ci add-plugin --branch ${GITHUB_REF##*/} wiris/moodle-qtype_wq
+          moodle-plugin-ci add-plugin wiris/moodle-qtype_wq
 
       - name: Install moodle-plugin-ci
         run: |