diff --git a/tests/build-gating-alternatives.fmf b/tests/build-gating-alternatives.fmf
index 8a798a4..a131972 100644
--- a/tests/build-gating-alternatives.fmf
+++ b/tests/build-gating-alternatives.fmf
@@ -18,12 +18,16 @@ adjust:
       and trigger != build
     enabled: false
 
+  - because: "lld is not supported in s390x"
+    enabled: false
+    when: arch == s390x
+
 discover:
     - name: lld-upstream-tests
       how: fmf
       test: ld-alternative
-      url: https://src.fedoraproject.org/rpms/lld.git
-      ref: rawhide
+      url: https://src.fedoraproject.org/tests/lld.git
+      ref: main
 execute:
     how: tmt
 provision:
diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf
index 6ce97b8..0f8610d 100644
--- a/tests/build-gating.fmf
+++ b/tests/build-gating.fmf
@@ -18,6 +18,10 @@ adjust:
       and trigger != build
     enabled: false
 
+  - because: "lld is not supported in s390x"
+    enabled: false
+    when: arch == s390x
+
   # Unfortunately, TMT does not support more declarative approach, we need to run commands on our own.
   - because: "On RHEL, CRB must be enabled to provide rarer packages"
     when: >-
@@ -40,12 +44,12 @@ discover:
     - name: lld-upstream-tests
       how: fmf
       filter: "tag:-spoils-installation"
-      url: https://src.fedoraproject.org/rpms/lld.git
-      ref: rawhide
+      url: https://src.fedoraproject.org/tests/lld.git
+      ref: main
     - name: upstream-llvm-integration-testsuite
       how: fmf
-      url: https://src.fedoraproject.org/rpms/llvm.git
-      ref: rawhide
+      url: https://src.fedoraproject.org/tests/llvm.git
+      ref: main
       test: integration-test-suite
 execute:
     how: tmt