diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.ChangeDirectory.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.ChangeDirectory.cs
index 27fb9ad1..5c58e1fa 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.ChangeDirectory.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.ChangeDirectory.cs
@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 
 namespace Renci.SshNet.Tests.Classes
@@ -8,7 +7,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.CreateDirectory.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.CreateDirectory.cs
index 20fb03a4..2c6284a6 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.CreateDirectory.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.CreateDirectory.cs
@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 using System;
 
@@ -9,7 +8,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.DeleteDirectory.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.DeleteDirectory.cs
index 3092426e..5e981afc 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.DeleteDirectory.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.DeleteDirectory.cs
@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 using System;
 
@@ -9,7 +8,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.DeleteFile.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.DeleteFile.cs
index 5a9446f5..d3a615d4 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.DeleteFile.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.DeleteFile.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 using System;
 
@@ -8,7 +7,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.Download.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.Download.cs
index e2622447..85a2d7ec 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.Download.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.Download.cs
@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 using System;
 using System.IO;
@@ -10,7 +9,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.ListDirectory.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.ListDirectory.cs
index 49bfcd27..69f90aef 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.ListDirectory.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.ListDirectory.cs
@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 using System;
 using System.Diagnostics;
@@ -11,7 +10,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.RenameFile.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.RenameFile.cs
index 7515359a..e1685d09 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.RenameFile.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.RenameFile.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 using System;
 using System.IO;
@@ -9,7 +8,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.SynchronizeDirectories.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.SynchronizeDirectories.cs
index 5fc93358..2c9ddb3e 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.SynchronizeDirectories.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.SynchronizeDirectories.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 using System.Diagnostics;
 using System.IO;
@@ -10,7 +9,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest.Upload.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest.Upload.cs
index d1211272..aa70e232 100644
--- a/src/Renci.SshNet.Tests/Classes/SftpClientTest.Upload.cs
+++ b/src/Renci.SshNet.Tests/Classes/SftpClientTest.Upload.cs
@@ -1,7 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
 using Renci.SshNet.Sftp;
-using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
 using System;
 using System.Collections.Generic;
@@ -13,7 +12,7 @@ namespace Renci.SshNet.Tests.Classes
     /// <summary>
     /// Implementation of the SSH File Transfer Protocol (SFTP) over SSH.
     /// </summary>
-    public partial class SftpClientTest : TestBase
+    public partial class SftpClientTest
     {
         [TestMethod]
         [TestCategory("Sftp")]