diff --git a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsConnectionsPageTests.cs b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsConnectionsPageTests.cs
index 190934c51..5ce461c89 100644
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsConnectionsPageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsConnectionsPageTests.cs
@@ -13,14 +13,14 @@ namespace mRemoteNGTests.UI.Forms.OptionsPages
         public void ConnectionsPageLinkExistsInListView()
         {
             ListViewTester listViewTester = new ListViewTester("lstOptionPages", _optionsForm);
-            Assert.That(listViewTester.Items[4].Text, Does.Match("Connections"));
+            Assert.That(listViewTester.Items[2].Text, Does.Match("Connections"));
         }
 
         [Test]
         public void ConnectionsIconShownInListView()
         {
             ListViewTester listViewTester = new ListViewTester("lstOptionPages", _optionsForm);
-            Assert.That(listViewTester.Items[4].ImageList, Is.Not.Null);
+            Assert.That(listViewTester.Items[2].ImageList, Is.Not.Null);
         }
 
         [Test]
diff --git a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsTabsPanelPageTests.cs b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsTabsPanelPageTests.cs
index 4dbe996f7..67e13515a 100644
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsTabsPanelPageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsTabsPanelPageTests.cs
@@ -13,14 +13,14 @@ namespace mRemoteNGTests.UI.Forms.OptionsPages
         public void TabsPanelPageLinkExistsInListView()
         {
             ListViewTester listViewTester = new ListViewTester("lstOptionPages", _optionsForm);
-            Assert.That(listViewTester.Items[2].Text, Does.Match("Tabs & Panels"));
+            Assert.That(listViewTester.Items[3].Text, Does.Match("Tabs & Panels"));
         }
 
         [Test]
         public void TabsPanelIconShownInListView()
         {
             ListViewTester listViewTester = new ListViewTester("lstOptionPages", _optionsForm);
-            Assert.That(listViewTester.Items[2].ImageList, Is.Not.Null);
+            Assert.That(listViewTester.Items[3].ImageList, Is.Not.Null);
         }
 
         [Test]
diff --git a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs
index 275453891..a0cbea73d 100644
--- a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs
+++ b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs
@@ -66,7 +66,6 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
         public void AutomaticResizePropertyShown_WhenResolutionIsDynamic(RDPResolutions resolution)
         {
             ConnectionInfo.Resolution = resolution;
-            ExpectedPropertyList.Clear();
             ExpectedPropertyList.Add(nameof(mRemoteNG.Connection.ConnectionInfo.AutomaticResize));
 
             RunVerification();