diff --git a/main.pm b/main.pm
index f9061d8a..3caaa78f 100644
--- a/main.pm
+++ b/main.pm
@@ -378,6 +378,16 @@ sub load_postinstall_tests() {
 ## LOADING STARTS HERE
 
 
+# ugly hack while FreeIPA replica tests are broken on Rawhide:
+# https://bugzilla.redhat.com/show_bug.cgi?id=2490607
+# divert them to a null test that just records a soft failure
+# so the failures don't mess up our views
+if (get_var('VERSION', '1') eq get_var('RAWREL', '2')) {
+    if (get_var('TEST') =~ m/replication/) {
+        autotest::loadtest 'tests/replica_null.pm';
+        return 1;
+    }
+}
 # if user set ENTRYPOINT, run required test directly
 # (good for tests where it doesn't make sense to use _boot_to_anaconda, _software_selection etc.)
 # if you want to run more than one test via ENTRYPOINT, separate them with space
diff --git a/tests/replica_null.pm b/tests/replica_null.pm
new file mode 100644
index 00000000..c07b33bf
--- /dev/null
+++ b/tests/replica_null.pm
@@ -0,0 +1,15 @@
+use base "installedtest";
+use strict;
+use testapi;
+
+sub run {
+    record_soft_failure 'FreeIPA replica tests known broken on Rawhide: https://bugzilla.redhat.com/show_bug.cgi?id=2490607';
+}
+
+sub test_flags {
+    return {fatal => 1};
+}
+
+1;
+
+# vim: set sw=4 et: