diff --git a/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiCompatibilityPluginSuite.pm b/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiCompatibilityPluginSuite.pm
index f40dc1277e..ae645aa9df 100755
--- a/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiCompatibilityPluginSuite.pm
+++ b/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiCompatibilityPluginSuite.pm
@@ -6,7 +6,7 @@ use warnings;
 use Unit::TestSuite;
 our @ISA = 'Unit::TestSuite';
 
-sub include_tests { return 'TWikiFuncTests' }
+sub include_tests { return 'TWikiFuncTests', 'TWikiLinkTests' }
 
 1;
 __END__
diff --git a/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiLinkTests.pm b/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiLinkTests.pm
new file mode 100644
index 0000000000..c355f182a4
--- /dev/null
+++ b/TWikiCompatibilityPlugin/test/unit/TWikiCompatibilityPlugin/TWikiLinkTests.pm
@@ -0,0 +1,38 @@
+#
+# Unit tests for handling of links
+#
+
+package TWikiLinkTests;
+use FoswikiFnTestCase;
+our @ISA = qw( FoswikiFnTestCase );
+
+use strict;
+use Foswiki::Func;
+
+sub new {
+    my $self = shift()->SUPER::new( "Link", @_ );
+    return $self;
+}
+
+sub test_renamedMainTopic {
+    my $this = shift;
+    my $goodLink = Foswiki::Func::renderText('Main.SitePreferences');
+    my $oldLink = Foswiki::Func::renderText('Main.TWikiPreferences');
+    $this->assert_str_equals($goodLink, $oldLink);
+}
+
+sub test_renamedSystemTopic {
+    my $this = shift;
+    my $goodLink = Foswiki::Func::renderText('System.BeginnersStartHere');
+    my $oldLink = Foswiki::Func::renderText('TWiki.ATasteOfTWiki');
+    $this->assert_str_equals($goodLink, $oldLink);
+}
+
+sub test_renamedSystemTopicWithLinkText {
+    my $this = shift;
+    my $goodLink = Foswiki::Func::renderText('[[System.BeginnersStartHere][Link Text]]');
+    my $oldLink = Foswiki::Func::renderText('[[TWiki.ATasteOfTWiki][Link Text]]');
+    $this->assert_str_equals($goodLink, $oldLink);
+}
+
+1;