diff --git a/tests/fedora_release.pm b/tests/fedora_release.pm
index bf700abb..723dd3f0 100644
--- a/tests/fedora_release.pm
+++ b/tests/fedora_release.pm
@@ -19,7 +19,9 @@ sub run {
     # IoT has a branch that acts more or less like Rawhide, but has
     # its version as the Rawhide release number, not 'Rawhide'. This
     # handles that
-    $tospell = 'Rawhide' if ($tospell eq $rawrel);
+    if (get_var("SUBVARIANT") eq "IoT") {
+        $tospell = 'Rawhide' if ($tospell eq $rawrel);
+    }
     # this is the Rawhide release number, which we expect to see.
     $expectver = $rawrel if ($expectver eq "Rawhide");
     # Create a spelt form of the version number.
@@ -27,7 +29,8 @@ sub run {
     # Create the expected content of the release file
     # and compare it with its real counterpart.
     my $expected = "Fedora release $expectver ($speltnum)";
-    validate_script_output 'cat /etc/fedora-release', sub { $_ eq $expected };
+    diag("The fedora-release content to validate: $expected");
+    validate_script_output("cat /etc/fedora-release", qr/$expected/);
 }
 
 sub test_flags {
diff --git a/tests/os_release.pm b/tests/os_release.pm
index 5d53684e..d66aaa8e 100644
--- a/tests/os_release.pm
+++ b/tests/os_release.pm
@@ -67,7 +67,9 @@ sub run {
         # IoT has a branch that acts more or less like Rawhide, but has
         # its version as the Rawhide release number, not 'Rawhide'. This
         # handles that
-        $version_id = 'Rawhide' if ($version_id eq $rawrel);
+	    if (get_var("SUBVARIANT") eq "IoT") {
+	        $version_id = 'Rawhide' if ($version_id eq $rawrel);
+	    }
         my $varstr = spell_version_number($version_id);
         my $target = lc($version_id);
         $version_id = $rawrel if ($version_id eq "Rawhide");