diff --git a/build-gating.fmf b/build-gating.fmf
deleted file mode 100644
index e3a6bcf..0000000
--- a/build-gating.fmf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Build/PR gating tests for LLDB
-#
-# Compatible with various LLVM distributions:
-#
-#   * Fedora (ursine packages)
-#   * Centos 9 stream (ursine packages)
-#   * RHEL-9 (ursine packages)
-#   * RHEL-8 (Red Hat module)
-#   * RHEL-7 (software collection)
-#
-
-summary: lldb tests for build/PR gating
-adjust:
-  - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR."
-    when: >-
-      trigger is defined
-      and trigger != commit
-      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"
-    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"
-    when: "collection == llvm-toolset-15.0"
-
-discover:
-    - name: lldb-tests
-      how: fmf
-execute:
-    how: tmt
-provision:
-  hardware:
-    memory: ">= 4 GiB"
diff --git a/plans/build-gating.fmf b/plans/build-gating.fmf
new file mode 100644
index 0000000..3068056
--- /dev/null
+++ b/plans/build-gating.fmf
@@ -0,0 +1,50 @@
+#
+# Build/PR gating tests for LLDB
+#
+# Compatible with various LLVM distributions:
+#
+#   * Fedora (ursine packages)
+#   * Centos 9 stream (ursine packages)
+#   * RHEL-9 (ursine packages)
+#   * RHEL-8 (Red Hat module)
+#   * RHEL-7 (software collection)
+#
+
+summary: lldb tests for build/PR gating
+adjust:
+  - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR."
+    when: >-
+      trigger is defined
+      and trigger != commit
+      and trigger != build
+    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: lldb-tests
+    how: fmf
+  - 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:
+  hardware:
+    memory: ">= 4 GiB"