diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build
index aac037fe6..9c39e45b6 100644
--- a/test cases/frameworks/15 llvm/meson.build	
+++ b/test cases/frameworks/15 llvm/meson.build	
@@ -8,6 +8,11 @@ if not d.found()
   error('MESON_SKIP_TEST llvm not found.')
 endif
 
+if method != 'config-tool' and d.version().startswith('17.0') and host_machine.system() == 'windows'
+  # https://github.com/llvm/llvm-project/commit/e7fc7540daa9333f0be4f380fc9c619236d17f57#r130257253
+  error('MESON_SKIP_TEST broken llvm cmake files on MSYS2')
+endif
+
 modules_to_find = [
   'bitwriter', 'asmprinter', 'executionengine', 'mcjit', 'target',
   'nativecodegen', 'amdgpu', 'engine'
diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json
index 66ecd4355..f9d730514 100644
--- a/test cases/frameworks/15 llvm/test.json	
+++ b/test cases/frameworks/15 llvm/test.json	
@@ -2,9 +2,9 @@
   "matrix": {
     "options": {
       "method": [
-        { "val": "config-tool", "skip_on_jobname": ["msys2-gcc"]},
-        { "val": "cmake", "skip_on_jobname": ["msys2-gcc"] },
-        { "val": "combination", "skip_on_jobname": ["msys2-gcc"]}
+        { "val": "config-tool", "skip_on_jobname": ["msys2-gcc"] },
+        { "val": "cmake", "skip_on_jobname": ["msys2"] },
+        { "val": "combination", "skip_on_jobname": ["msys2"] }
       ],
       "link-static": [
         { "val": true, "skip_on_jobname": ["opensuse"] },