diff --git a/gating.yaml b/gating.yaml
index 282e16b..277bfe1 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,23 @@
 --- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+# Rawhide
+--- !Policy
 product_versions:
   - fedora-*
 decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..0d899fc
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,3 @@
+---
+annocheck:
+  - rhel-policy: --skip-pie --ignore-unknown --verbose
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
index 447424e..5d9f79f 100644
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@@ -1,4 +1,15 @@
 summary: Upstream tests
+contact: Jitka Plesnikova <jplesnik@redhat.com>
 component: perl-File-MimeInfo
 require: perl-File-MimeInfo-tests
 test: /usr/libexec/perl-File-MimeInfo/test
+enabled: true
+tag:
+  - rhel-buildroot
+  - TestCaseCopy
+  - Tier1
+tier: '1'
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false