diff --git a/ChangeLog b/ChangeLog
index 85c48f2a..0ba173b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2026-05-19  Mats Lidell  <matsl@gnu.org>
+
+* test/hy-test-dependencies.el (fboundp): When markdown-ts-mode is defined
+    prefer markdown-mode. This avoids markdown-ts-mode prompting for
+    treesitter grammar.
+
 2026-05-16  Bob Weiner  <rsw@gnu.org>
 
 * man/hyperbole.texi (Default Hyperbole Bindings): Update doc for {M-w} to copy
diff --git a/test/hy-test-dependencies.el b/test/hy-test-dependencies.el
index 47207be4..9fafde2c 100644
--- a/test/hy-test-dependencies.el
+++ b/test/hy-test-dependencies.el
@@ -18,6 +18,12 @@
 
 ;;; Code:
 
+;; Force markdown-mode to be selected first to avoid markdown-ts-mode
+;; for now. It requires Tree-sitter grammars to be installed which
+;; conflicts with our current CI setup.
+(when (fboundp #'markdown-ts-mode)
+  (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode)))
+
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
 (package-initialize)