diff --git a/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs b/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs
index c48cee58d7..0121e128e1 100644
--- a/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs
+++ b/src/Umbraco.Tests/IO/AbstractFileSystemTests.cs
@@ -9,7 +9,7 @@ using Umbraco.Tests.BusinessLogic;
 
 namespace Umbraco.Tests.IO
 {
-    [TestFixture]
+    [TestFixture, RequiresSTA]
     internal abstract class AbstractFileSystemTests 
     {
         protected IFileSystem _fileSystem;
diff --git a/src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs b/src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs
index dc79f82620..6c51acbe6e 100644
--- a/src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs
+++ b/src/Umbraco.Tests/IO/PhysicalFileSystemTests.cs
@@ -9,14 +9,26 @@ using Umbraco.Tests.BusinessLogic;
 
 namespace Umbraco.Tests.IO
 {
-    [TestFixture]
+    [TestFixture, RequiresSTA]
     internal class PhysicalFileSystemTests : AbstractFileSystemTests
     {
         public PhysicalFileSystemTests()
-            : base(new PhysicalFileSystem(AppDomain.CurrentDomain.BaseDirectory,
+            : base(new PhysicalFileSystem(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests"),
                 "/Media/"))
         { }
 
+        [SetUp]
+        public void Setup()
+        {
+            
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Directory.Delete(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests"));
+        }
+
         protected override string ConstructUrl(string path)
         {
             return "/Media/" + path;