diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a10e17447cd7d61949980042874b19054d95500..2d54d45583555995d1cf862e2e897167ff6666e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,6 +49,10 @@ include:
 # Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
 ################
 
+variables:
+  # Add extra phpunit job for the previous core minor version.
+  OPT_IN_TEST_PREVIOUS_MINOR: 1
+
 eslint:
   before_script:
     - echo "ESLINT version $(${CI_PROJECT_DIR}/${_WEB_ROOT}/core/node_modules/.bin/eslint --version)"
@@ -62,14 +66,30 @@ stylelint:
 phpcs:
   allow_failure: false
 
-phpunit:
+phpunit (previous minor):
+  allow_failure: false
   before_script:
     # Provide some context on the test run. This is also done later, but the job will halt if the patching fails, so do it here too.
     - vendor/bin/drush status
     # Apply core patches
     - cd $CI_PROJECT_DIR/$_WEB_ROOT
-    # Apply core patch from https://www.drupal.org/project/drupal/issues/2895388 which is on MR 3273
-    # This includes the small tableresponsive change from issue 3331975
-    # @todo Remove this when core has added the machine name and that core version is used here.
+    # Apply core patch from https://www.drupal.org/project/drupal/issues/2895388 which is on MR 3273 (for core 10.1) and MR 5496 for 10.2
+    # This adds the machine to the uninstall page and includes the small tableresponsive change from issue 3331975
+    # @todo Remove this when the above issue is committed and the new core version is used in this job step.
     - curl https://git.drupalcode.org/project/drupal/-/merge_requests/3273.diff | patch -p1 --verbose
     - cd $CI_PROJECT_DIR
+
+phpunit:
+  # The Tests pass at 10.1 so allow failure at 10.2
+  # See https://www.drupal.org/project/module_filter/issues/3412061
+  allow_failure: true
+  before_script:
+    # Provide some context on the test run. This is also done later, but the job will halt if the patching fails, so do it here too.
+    - vendor/bin/drush status
+    # Apply core patches
+    - cd $CI_PROJECT_DIR/$_WEB_ROOT
+    # Apply core patch from https://www.drupal.org/project/drupal/issues/2895388 which is on MR 3273 (for core 10.1) and MR 5496 for 10.2
+    # This adds the machine to the uninstall page and includes the small tableresponsive change from issue 3331975
+    # @todo Remove this when the above issue is committed and the new core version is used in this job step.
+    - curl https://git.drupalcode.org/project/drupal/-/merge_requests/5496.diff | patch -p1 --verbose
+    - cd $CI_PROJECT_DIR