diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index 62745e02..b88ccb14 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -294,9 +294,6 @@
     <Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExtensionsTest_Reverse.cs">
       <Link>Classes\Common\ExtensionsTest_Reverse.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExtensionsTest_ShellQuote.cs">
-      <Link>Classes\Common\ExtensionsTest_ShellQuote.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet.Tests\Classes\Common\ExtensionsTest_Take_Count.cs">
       <Link>Classes\Common\ExtensionsTest_Take_Count.cs</Link>
     </Compile>
@@ -1602,7 +1599,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
+      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_ShellQuote.cs b/src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_ShellQuote.cs
deleted file mode 100644
index b657ef59..00000000
--- a/src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_ShellQuote.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-
-namespace Renci.SshNet.Tests.Classes.Common
-{
-    [TestClass]
-    public class ExtensionsTest_ShellQuote
-    {
-        [TestMethod]
-        public void Null()
-        {
-            const string value = null;
-
-            try
-            {
-                value.ShellQuote();
-                Assert.Fail();
-            }
-            catch (ArgumentNullException ex)
-            {
-                Assert.IsNull(ex.InnerException);
-                Assert.AreEqual("value", ex.ParamName);
-            }
-        }
-
-        [TestMethod]
-        public void Empty()
-        {
-            var value = string.Empty;
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("''", actual);
-        }
-
-        [TestMethod]
-        public void RegularCharacters()
-        {
-            var value = "onetwo";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("'onetwo'", actual);
-        }
-
-        /// <summary>
-        /// Tests all special character listed <a href="http://pubs.opengroup.org/onlinepubs/7908799/xcu/chap2.html">here</a>
-        /// except for newline and single-quote, which are tested separately.
-        /// </summary>
-        [TestMethod]
-        public void SpecialCharacters()
-        {
-            var value = "|&;<>()$`\\\" \t\n*?[#~=%";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("'|&;<>()$`\\\" \t\n*?[#~=%'", actual);
-        }
-
-        [TestMethod]
-        public void SingleExclamationPoint()
-        {
-            var value = "!one!two!";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("\\!'one'\\!'two'\\!", actual);
-        }
-
-        [TestMethod]
-        public void SequenceOfExclamationPoints()
-        {
-            var value = "one!!!two";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("'one'\\!\\!\\!'two'", actual);
-        }
-
-        [TestMethod]
-        public void SingleQuotes()
-        {
-            var value = "'a'b'c'd'";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("\"'\"'a'\"'\"'b'\"'\"'c'\"'\"'d'\"'\"", actual);
-        }
-
-        [TestMethod]
-        public void SequenceOfSingleQuotes()
-        {
-            var value = "one''two";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("'one'\"''\"'two'", actual);
-        }
-
-        [TestMethod]
-        public void LineFeeds()
-        {
-            var value = "one\ntwo\nthree\nfour";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("'one\ntwo\nthree\nfour'", actual);
-        }
-
-        [TestMethod]
-        public void SequenceOfLineFeeds()
-        {
-            var value = "one\n\ntwo";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("'one\n\ntwo'", actual);
-        }
-
-        public void SequenceOfSingleQuoteAndExclamationMark()
-        {
-            var value = "/var/would be 'kewl'!/not?";
-
-            var actual = value.ShellQuote();
-
-            Assert.AreEqual("'/var/would be '\"'\"'kewl'\"'\"\\!'/not?'", actual);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index f9c1b7a8..6b38674f 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -149,7 +149,6 @@
     <Compile Include="Classes\Common\ExtensionsTest_Concat.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_IsEqualTo_ByteArray.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_Reverse.cs" />
-    <Compile Include="Classes\Common\ExtensionsTest_ShellQuote.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_Take_Count.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_Take_OffsetAndCount.cs" />
     <Compile Include="Classes\Common\ExtensionsTest_TrimLeadingZeros.cs" />