diff --git a/plans/build-gating.fmf b/plans/build-gating.fmf
index 3e1e9e9..d48a9b7 100644
--- a/plans/build-gating.fmf
+++ b/plans/build-gating.fmf
@@ -19,22 +19,42 @@ adjust:
       and trigger != build
     enabled: false
 
-  - because: "When testing SCL-ized LLVM, the collection must be enabled first"
-    environment+:
-      WITH_SCL: "scl enable llvm-toolset-13.0 rust-toolset-1.58"
-    when: "collection == llvm-toolset-13.0"
-  - because: "When testing SCL-ized LLVM, the collection must be enabled first"
-    environment+:
-      WITH_SCL: "scl enable llvm-toolset-14.0 rust-toolset-1.62"
-    when: "collection == llvm-toolset-14.0"
-  - because: "When testing SCL-ized LLVM, the collection must be enabled first"
-    environment+:
-      WITH_SCL: "scl enable llvm-toolset-15.0 rust-toolset-1.66"
-    when: "collection == llvm-toolset-15.0"
+  - because: "libomp is not supported in s390x (llvm < 18)"
+    when: >
+      arch == s390x and distro < rhel-9, rhel-9.5, fedora-40, centos-stream-9
+    enabled: false
+
+  - because: "On RHEL-8+, CRB must be enabled to provide rarer packages"
+    prepare+:
+      - name: Enable CRB
+        how: shell
+        script: dnf config-manager --set-enabled *-CRB
+    when: >-
+      distro == rhel and distro >= rhel-8
+
+  - because: "On CentOS, CRB must be enabled to provide rarer packages"
+    prepare+:
+      - name: Enable CRB
+        how: shell
+        script: dnf install -y 'dnf-command(config-manager)' && dnf config-manager --set-enabled crb
+    when: >-
+      distro == centos
 
 discover:
-    - name: libomp-tests
-      how: fmf
+  - name: libomp-tests
+    how: fmf
+  - name: clang-tests
+    how: fmf
+    url:  https://src.fedoraproject.org/tests/clang.git
+    ref: main
+    test:
+      - libomp
+      - openmp-rpm
+  - name: upstream-llvm-integration-testsuite
+    how: fmf
+    url: https://src.fedoraproject.org/tests/llvm.git
+    ref: main
+    test: integration-test-suite
 execute:
     how: tmt
 provision: