diff --git a/mRemoteNGTests/Credential/CredentialDeletionMsgBoxConfirmerTests.cs b/mRemoteNGTests/Credential/CredentialDeletionMsgBoxConfirmerTests.cs
new file mode 100644
index 000000000..e45ee0a30
--- /dev/null
+++ b/mRemoteNGTests/Credential/CredentialDeletionMsgBoxConfirmerTests.cs
@@ -0,0 +1,43 @@
+using System.Windows.Forms;
+using mRemoteNG.Credential;
+using NSubstitute;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Credential
+{
+    public class CredentialDeletionMsgBoxConfirmerTests
+    {
+        private ICredentialRecord _credentialRecord;
+
+        [SetUp]
+        public void Setup()
+        {
+            _credentialRecord = Substitute.For<ICredentialRecord>();
+        }
+
+        [Test]
+        public void ClickingYesReturnsTrue()
+        {
+            var deletionConfirmer = new CredentialDeletionMsgBoxConfirmer(MockClickYes);
+            Assert.That(deletionConfirmer.Confirm(_credentialRecord), Is.True);
+        }
+
+        [Test]
+        public void ClickingNoReturnsFalse()
+        {
+            var deletionConfirmer = new CredentialDeletionMsgBoxConfirmer(MockClickNo);
+            Assert.That(deletionConfirmer.Confirm(_credentialRecord), Is.False);
+        }
+
+        private DialogResult MockClickYes(string promptMessage, string title, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return DialogResult.Yes;
+        }
+
+        private DialogResult MockClickNo(string promptMessage, string title, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return DialogResult.No;
+        }
+    }
+}
\ No newline at end of file
diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj
index d4f947434..9c9607d51 100644
--- a/mRemoteNGTests/mRemoteNGTests.csproj
+++ b/mRemoteNGTests/mRemoteNGTests.csproj
@@ -129,6 +129,7 @@
     <Compile Include="Connection\AbstractConnectionInfoDataTests.cs" />
     <Compile Include="Connection\ConnectionInfoComparerTests.cs" />
     <Compile Include="Connection\Protocol\ProtocolListTests.cs" />
+    <Compile Include="Credential\CredentialDeletionMsgBoxConfirmerTests.cs" />
     <Compile Include="Credential\CredentialDomainUserComparerTests.cs" />
     <Compile Include="Credential\CredentialProviderCatalogTests.cs" />
     <Compile Include="Credential\CredentialRecordCatalogTests.cs" />