diff --git a/HistoryPlugin/test/unit/HistoryPlugin/HistoryPluginTests.pm b/HistoryPlugin/test/unit/HistoryPlugin/HistoryPluginTests.pm
index bba0966786..866ea7cfe2 100755
--- a/HistoryPlugin/test/unit/HistoryPlugin/HistoryPluginTests.pm
+++ b/HistoryPlugin/test/unit/HistoryPlugin/HistoryPluginTests.pm
@@ -316,7 +316,7 @@ sub test_header {
     my $date        = $this->_getDate($topicObject);
 
     my $expected = <<EXPECTED;
-<nop><h2 id="header"> header </h2>
+<nop><h2> <a name="header"></a> header </h2>
 r4 - $date - <a href="$url/$this->{users_web}/ScumBag">ScumBag</a><br />
 r3 - $date - <a href="$url/$this->{users_web}/ScumBag">ScumBag</a><br />
 r2 - $date - <a href="$url/$this->{users_web}/ScumBag">ScumBag</a><br />
@@ -351,7 +351,7 @@ sub test_footer {
 r3 - $date - <a href="$url/$this->{users_web}/ScumBag">ScumBag</a><br />
 r2 - $date - <a href="$url/$this->{users_web}/ScumBag">ScumBag</a><br />
 r1 - $date - <a href="$url/$this->{users_web}/ScumBag">ScumBag</a><br />
-<nop><h2 id="footer"> footer </h2>
+<nop><h2> <a name="footer"></a> footer </h2>
 EXPECTED
 
     my $actual = $topicObject->expandMacros(<<'ACTUAL');
diff --git a/UnitTestContrib/test/unit/FormattingTests.pm b/UnitTestContrib/test/unit/FormattingTests.pm
index 7f3c09ab13..63cbbcadcb 100644
--- a/UnitTestContrib/test/unit/FormattingTests.pm
+++ b/UnitTestContrib/test/unit/FormattingTests.pm
@@ -1179,12 +1179,6 @@ Space"@blahSTUFFED.com</a>',
         my $actual = <<ACTUAL;
 $url
 ACTUAL
-        if ( $this->check_dependency('Foswiki,<,1.2') ) {
-
-            # URL encoding of whitespace was borked before 1.2
-            $expected =~ s/%0a/%20/g;
-            $expected =~ s/%3d/%3D/g;
-        }
 
         #print STDERR "EXPECTED $expected from $actual\n";
         $this->do_test( $expected, $actual );
diff --git a/UnitTestContrib/test/unit/ZoneTests.pm b/UnitTestContrib/test/unit/ZoneTests.pm
index 9fd5e3177b..8033b42e67 100644
--- a/UnitTestContrib/test/unit/ZoneTests.pm
+++ b/UnitTestContrib/test/unit/ZoneTests.pm
@@ -12,9 +12,11 @@ sub set_up {
     $this->SUPER::set_up();
 
     # Disable plugins which add noise
-    $Foswiki::cfg{Plugins}{JQueryPlugin}{Enabled} = 0;
-    $Foswiki::cfg{Plugins}{TwistyPlugin}{Enabled} = 0;
-    $Foswiki::cfg{Plugins}{TablePlugin}{Enabled}  = 0;
+    $Foswiki::cfg{Plugins}{JQueryPlugin}{Enabled}  = 0;
+    $Foswiki::cfg{Plugins}{TwistyPlugin}{Enabled}  = 0;
+    $Foswiki::cfg{Plugins}{TablePlugin}{Enabled}   = 0;
+    $Foswiki::cfg{Plugins}{CommentPlugin}{Enabled} = 0;
+    $Foswiki::cfg{Plugins}{SmiliesPlugin}{Enabled} = 0;
 
     my $query = Unit::Request->new("");
     $query->path_info("/$this->{test_web}/$this->{test_topic}");