2 files changed, 7 insertions, 5 deletions

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 001c7795725..096a293b302 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -302,9 +302,7 @@ test-native-comp-speed0:
   extends: [.job-template, .test-template, .native-comp-template]
   variables:
     target: emacs-native-comp-speed0
-    make_params: >-
-      -C test check EXCLUDE_TESTS=%emacs-module-tests.el
-         SELECTOR='(not (tag :unstable))'
+    make_params: "-C test check SELECTOR='(not (tag :unstable))'"
 
 test-all-inotify:
   # This tests also file monitor libraries inotify and inotifywatch.
@@ -317,7 +315,7 @@ test-all-inotify:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
   variables:
     target: emacs-inotify
-    make_params: check-expensive EXCLUDE_TESTS=%emacs-module-tests.el
+    make_params: check-expensive
     # Two hours.
     EMACS_TEST_TIMEOUT: 7200
 
diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index 442bca5facb..988b311f5b5 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -247,6 +247,7 @@ must evaluate to a regular expression string."
 
 (ert-deftest module--test-assertions--load-non-live-object ()
   "Check that -module-assertions verify that non-live objects aren't accessed."
+  :tags (if (getenv "EMACS_EMBA_CI") '(:unstable))
   (skip-unless (or (file-executable-p mod-test-emacs)
                    (and (eq system-type 'windows-nt)
                         (file-executable-p (concat mod-test-emacs ".exe")))))
@@ -265,6 +266,7 @@ must evaluate to a regular expression string."
 This differs from `module--test-assertions-load-non-live-object'
 in that it stows away a global reference.  The module assertions
 should nevertheless detect the invalid load."
+  :tags (if (getenv "EMACS_EMBA_CI") '(:unstable))
   (skip-unless (or (file-executable-p mod-test-emacs)
                    (and (eq system-type 'windows-nt)
                         (file-executable-p (concat mod-test-emacs ".exe")))))
@@ -281,6 +283,7 @@ should nevertheless detect the invalid load."
 (ert-deftest module--test-assertions--call-emacs-from-gc ()
   "Check that -module-assertions prevents calling Emacs functions
 during garbage collection."
+  :tags (if (getenv "EMACS_EMBA_CI") '(:unstable))
   (skip-unless (or (file-executable-p mod-test-emacs)
                    (and (eq system-type 'windows-nt)
                         (file-executable-p (concat mod-test-emacs ".exe")))))
@@ -292,7 +295,8 @@ during garbage collection."
 (ert-deftest module--test-assertions--globref-invalid-free ()
   "Check that -module-assertions detects invalid freeing of a
 local reference."
-    (skip-unless (or (file-executable-p mod-test-emacs)
+  :tags (if (getenv "EMACS_EMBA_CI") '(:unstable))
+  (skip-unless (or (file-executable-p mod-test-emacs)
                    (and (eq system-type 'windows-nt)
                         (file-executable-p (concat mod-test-emacs ".exe")))))
   (module--test-assertion