diff --git a/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/case1.c b/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/case1.c
index 525db32..95b5e2b 100644
--- a/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/case1.c
+++ b/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/case1.c
@@ -1,6 +1,8 @@
 #include <nss.h>
 #include <stdlib.h>
 
+extern int NSS_NoDB_Init(void*);
+
 int main()
 {
   NSS_NoDB_Init(NULL);
diff --git a/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/main.fmf b/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/main.fmf
index 3844c59..e488ec0 100644
--- a/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/main.fmf
+++ b/Regression/bz580078-valgrind-aborts-with-vex-x86-IR-unhandled-instruction-bytes/main.fmf
@@ -45,6 +45,10 @@ adjust:
   - enabled: false
     when: arch != x86_64
 
+  # No i686 in RHEL-10+
+  - enabled: false
+    when: distro >= rhel-10
+
   # Testing farm does not support installing i686 packages in bodhi update testing,
   # so we disable this test there until that capacity is implemented.
   - enabled: false
diff --git a/Sanity/32bit-on-64bit-os/main.fmf b/Sanity/32bit-on-64bit-os/main.fmf
index 1b41f20..af58f83 100644
--- a/Sanity/32bit-on-64bit-os/main.fmf
+++ b/Sanity/32bit-on-64bit-os/main.fmf
@@ -26,6 +26,10 @@ adjust:
   - enabled: false
     when: arch != x86_64
 
+  # No i686 in RHEL-10+
+  - enabled: false
+    when: distro >= rhel-10
+
   # Testing farm does not support installing i686 packages in bodhi update testing,
   # so we disable this test there until that capacity is implemented.
   - enabled: false
diff --git a/Sanity/install-weak-deps/main.fmf b/Sanity/install-weak-deps/main.fmf
new file mode 100644
index 0000000..9e4aa46
--- /dev/null
+++ b/Sanity/install-weak-deps/main.fmf
@@ -0,0 +1,6 @@
+summary: Make sure dnf installs weak dep packages (such as valgrind + valgrind-scripts)
+test: ./runtest.sh
+framework: beakerlib
+require:
+  - rpm-build
+  - createrepo
diff --git a/Sanity/install-weak-deps/runtest.sh b/Sanity/install-weak-deps/runtest.sh
new file mode 100755
index 0000000..b952e10
--- /dev/null
+++ b/Sanity/install-weak-deps/runtest.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+DNFSWITCHES="--disablerepo=\* --enablerepo=mytestingrepo"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlRun "dnf -y remove trivial-empty\* ||:"
+        rlRun "rm /etc/yum.repos.d/mytestingrepo.repo ||:"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "rpmbuild -ba trivial-empty-v1.spec"
+        rlRun "rpmbuild -ba trivial-empty-v2.spec"
+        rlRun "a=$(rpm -E '%_arch')"
+        rlRun "pushd $HOME/rpmbuild/RPMS/$a"
+        rlRun "createrepo ."
+        rlRun "popd"
+        rlRun "rpm -Uvh --nosignature $HOME/rpmbuild/RPMS/$a/trivial-empty-1.0-1*"
+        rlRun "rpm -qa | grep -F trivial-empty-sub" 1
+        rlRun "rpm -qa | grep -F trivial-empty-1.0-1"
+        rlRun "rpm -qa | grep -F trivial-empty-1.0-2" 1
+        cat > /etc/yum.repos.d/mytestingrepo.repo <<EOF
+[mytestingrepo]
+name=mytestingrepo
+baseurl=file:///$HOME/rpmbuild/RPMS/$a
+gpgcheck=0
+enabled=1
+EOF
+        rlRun "cat /etc/yum.repos.d/mytestingrepo.repo"
+        rlRun "dnf $DNFSWITCHES clean all"
+        rlRun "dnf $DNFSWITCHES -y update trivial-empty"
+        rlRun "rpm -qa | grep -F trivial-empty-1.0-1" 1
+        rlRun "rpm -qa | grep -F trivial-empty-1.0-2"
+        # The gist of this test is to make sure the following
+        # trivial-empty-sub-1.0-2 is now installed as a weak dep
+        rlRun "rpm -qa | grep -F trivial-empty-sub-1.0-2"
+        # Since it's a weak dep, it should be possible to remove
+        # trivial-empty-sub now, and the trivial-empty should still
+        # be installed
+        rlRun "dnf $DNFSWITCHES remove -y trivial-empty-sub"
+        rlRun "rpm -qa | grep -F trivial-empty-1.0-2"
+        rlRun "rpm -qa | grep -F trivial-empty-sub-1.0-2" 1
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "dnf -y remove trivial-empty\*"
+        rlRun "rm /etc/yum.repos.d/mytestingrepo.repo"
+    rlPhaseEnd
+rlJournalEnd
diff --git a/Sanity/install-weak-deps/trivial-empty-v1.spec b/Sanity/install-weak-deps/trivial-empty-v1.spec
new file mode 100644
index 0000000..f672285
--- /dev/null
+++ b/Sanity/install-weak-deps/trivial-empty-v1.spec
@@ -0,0 +1,34 @@
+Name:           trivial-empty
+Version:        1.0
+Release:        1%{?dist}
+Epoch: 1
+Summary:        A trivial RPM package with an empty payload
+
+License:        MIT
+BuildArch:      %_arch
+
+# Description of the package
+%description
+This is a trivial RPM package with no payload. It serves as an example 
+of how to create an RPM specfile with minimal content.
+
+# Prep stage: nothing to prepare
+%prep
+# Empty section
+
+# Build stage: nothing to build
+%build
+# Empty section
+
+# Install stage: nothing to install
+%install
+# Empty section
+
+# Files: no files to include
+%files
+# Empty section
+
+# Changelog for the RPM package
+%changelog
+* Thu Jan 16 2025 Example Maintainer <example@example.com> - 1.0-1
+- Initial creation of a trivial RPM with no payload
diff --git a/Sanity/install-weak-deps/trivial-empty-v2.spec b/Sanity/install-weak-deps/trivial-empty-v2.spec
new file mode 100644
index 0000000..155b79c
--- /dev/null
+++ b/Sanity/install-weak-deps/trivial-empty-v2.spec
@@ -0,0 +1,52 @@
+Name:           trivial-empty
+Version:        1.0
+Release:        2%{?dist}
+Epoch: 1
+Summary:        A trivial RPM package with an empty payload
+
+License:        MIT
+BuildArch:      %_arch
+
+# Set weak dependency on trivial-empty-sub which is a new subpackage
+# introduced within this update
+Recommends: trivial-empty-sub = %{epoch}:%{version}-%{release}
+# Requires: trivial-empty-sub = %{epoch}:%{version}-%{release}
+
+# Description of the package
+%description
+This is a trivial RPM package with no payload. It serves as an example 
+of how to create an RPM specfile with minimal content.
+
+%package sub
+Summary: A trivial RPM subpackage with an empty payload
+# Description for the subpackage
+%description sub
+This is a subpackage of trivial-empty, with an empty payload.
+
+# Prep stage: nothing to prepare
+%prep
+# Empty section
+
+# Build stage: nothing to build
+%build
+# Empty section
+
+# Install stage: nothing to install
+%install
+# Empty section
+
+# Files: no files to include
+%files
+# Empty section
+
+# Subpackage files: no files to include
+%files sub
+# Empty section
+
+# Changelog for the RPM package
+%changelog
+* Thu Jan 16 2025 Example Maintainer <example@example.com> - 1.0-2
+- Initial creation of the trivial RPM with no payload
+
+* Thu Jan 16 2025 Example Maintainer <example@example.com> - 1.0-1
+- Initial creation of a trivial RPM with no payload