diff --git a/tests/binutils-plugin-ar/main.fmf b/tests/binutils-plugin-ar/main.fmf
index ef8a698..9d67528 100644
--- a/tests/binutils-plugin-ar/main.fmf
+++ b/tests/binutils-plugin-ar/main.fmf
@@ -14,4 +14,8 @@ adjust+:
     enabled: false
     when: distro == rhel-7
 
+  - because: compat llvm-libs does not install LLVMgold.so in bfd-plugins dir
+    enabled: false
+    when: compat is defined
+
 extra-nitrate: TC#0614092
diff --git a/tests/find-package-llvm/main.fmf b/tests/find-package-llvm/main.fmf
index a1fd340..d662b8b 100644
--- a/tests/find-package-llvm/main.fmf
+++ b/tests/find-package-llvm/main.fmf
@@ -17,9 +17,9 @@ require+:
   - git
   - make
   - cmake
-  - llvm-devel
-  - clang
-  - clang-devel
+  - llvm18-devel
+  - clang18
+  - clang18-devel
 adjust+:
   - enabled: false
     when: collection is defined
diff --git a/tests/integration-test-suite/compat.fmf b/tests/integration-test-suite/compat.fmf
index 6d976d3..66a3d25 100644
--- a/tests/integration-test-suite/compat.fmf
+++ b/tests/integration-test-suite/compat.fmf
@@ -3,14 +3,14 @@
 
 require+:
   - cmake
-  - clang
-  - clang-analyzer
-  - clang-devel
-  - clang-tools-extra
-  - compiler-rt
-  - lld
-  - libomp-devel
-  - llvm-devel
+  - clang18
+  - clang18-analyzer
+  - clang18-devel
+  - clang18-tools-extra
+  - compiler-rt18
+  - lld18
+  - libomp18-devel
+  - llvm18-devel
   - python3-lit
 
 environment+:
diff --git a/tests/integration-test-suite/test.sh b/tests/integration-test-suite/test.sh
index 2e44d64..e815d8f 100755
--- a/tests/integration-test-suite/test.sh
+++ b/tests/integration-test-suite/test.sh
@@ -47,7 +47,8 @@ rlJournalStart
         CONFIG_CMD+="${NO_LIBUNWIND:+ -DENABLE_LIBUNWIND=OFF}"
         rlRun "${CONFIG_CMD}" 0 "Configure testsuite"
 
-        rlRun "cmake --build . --target check" 0 "Run testsuite"
+        # Filtered out scanbuild_py_make.txt, check https://bugzilla.redhat.com/show_bug.cgi?id=2275093
+        rlRun "lit --show-unsupported --show-xfail --filter-out scanbuild_py_makefile.txt -v tests" 0 "Run testsuite"
     rlPhaseEnd
 
     rlPhaseStartCleanup
diff --git a/tests/libllvm-size/main.fmf b/tests/libllvm-size/main.fmf
index ac33d73..2b36639 100644
--- a/tests/libllvm-size/main.fmf
+++ b/tests/libllvm-size/main.fmf
@@ -5,7 +5,7 @@ extra-summary: /tools/llvm/libllvm-size
 extra-task: /tools/llvm/libllvm-size
 
 environment:
-  LIBLLVM_PATH: /usr/lib64/libLLVM.so
+  LIBLLVM_PATH: /usr/lib64/llvm18/lib/libLLVM.so
 adjust+:
 
   - because: "With SCL-ized LLVM, library path is different"
diff --git a/tests/main.fmf b/tests/main.fmf
index b4e0424..f095435 100644
--- a/tests/main.fmf
+++ b/tests/main.fmf
@@ -14,7 +14,7 @@ framework: shell
 
 # Always define "test" key and override in adjust or in each specific test
 # metadata if needed.
-test: ./test.sh
+test: "PATH=/usr/lib64/llvm18/bin:$PATH ./test.sh"
 
 # Commonly used keys are initialized to empty.
 require: []
@@ -24,10 +24,10 @@ tag: []
 adjust+:
   # Common requirements when LLVM is not SCL-ized
   - require+:
-      - llvm
-      - llvm-libs
-      - llvm-devel
-      - clang
+      - llvm18
+      - llvm18-libs
+      - llvm18-devel
+      - clang18
     when: collection is not defined
 
   # Requirements for SCL-ized LLVM
diff --git a/tests/rust-sanity/main.fmf b/tests/rust-sanity/main.fmf
index 6ed580a..461b5b8 100644
--- a/tests/rust-sanity/main.fmf
+++ b/tests/rust-sanity/main.fmf
@@ -21,6 +21,10 @@ adjust+:
       - rust
     when: "collection is not defined"
 
+  - because: "Rust uses latest llvm version"
+    enabled: false
+    when: compat is defined
+
   # Requirements for SCL-ized LLVM
   - require+:
       - rust-toolset-1.58-cargo