diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2e27e78..e5388a6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,10 +12,3 @@ repos:
   rev: 1.32.2
   hooks:
   - id: tmt-lint
-
-- repo: https://github.com/koalaman/shellcheck-precommit
-  rev: v0.10.0
-  hooks:
-  - id: shellcheck
-    require_serial: true # Podman has trouble running concurrently
-    args: ["--exclude=SC1091"] # Ignore "Not following" sourced scripts
diff --git a/tests/main.fmf b/tests/main.fmf
index 872f1ef..ea268a4 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: []
@@ -35,10 +35,10 @@ adjust+:
 
   # Common requirements when LLVM is not SCL-ized
   - require+:
-      - clang
-      - clang-libs
-      - libomp
-      - libomp-devel
+      - clang18
+      - clang18-libs
+      - libomp18
+      - libomp18-devel
     when: collection is not defined
 
   # Requirements for SCL-ized LLVM