diff --git a/SharpCompress.Test/SharpCompress.Test.Portable.csproj b/SharpCompress.Test/SharpCompress.Test.Portable.csproj
index b1479253..6ed57170 100644
--- a/SharpCompress.Test/SharpCompress.Test.Portable.csproj
+++ b/SharpCompress.Test/SharpCompress.Test.Portable.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpCompress.Test</RootNamespace>
-    <AssemblyName>SharpCompress.Test</AssemblyName>
+    <AssemblyName>SharpCompress.Test.Portable</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -23,7 +23,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\DebugPortable\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/SharpCompress.Test/TestBase.cs b/SharpCompress.Test/TestBase.cs
index 0a141e2c..cf845da3 100644
--- a/SharpCompress.Test/TestBase.cs
+++ b/SharpCompress.Test/TestBase.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SharpCompress.Common;
 using SharpCompress.Reader;
@@ -148,5 +149,19 @@ namespace SharpCompress.Test
                 Assert.IsFalse(archive2.MoveToNextEntry());
             }
         }
+
+        private static readonly object testLock = new object();
+
+        [TestInitialize]
+        public void TestSetup()
+        {
+            Monitor.Enter(testLock);
+        }
+
+        [TestCleanup]
+        public void TestCleanup()
+        {
+            Monitor.Exit(testLock);
+        }
     }
 }
diff --git a/SharpCompress/AssemblyInfo.cs b/SharpCompress/AssemblyInfo.cs
index 8bd7f1d1..37300f3c 100644
--- a/SharpCompress/AssemblyInfo.cs
+++ b/SharpCompress/AssemblyInfo.cs
@@ -12,4 +12,8 @@ using System.Runtime.CompilerServices;
     InternalsVisibleTo(
         "SharpCompress.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010005d6ae1b0f6875393da83c920a5b9408f5191aaf4e8b3c2c476ad2a11f5041ecae84ce9298bc4c203637e2fd3a80ad5378a9fa8da1363e98cea45c73969198a4b64510927c910001491cebbadf597b22448ad103b0a4007e339faf8fe8665dcdb70d65b27ac05b1977c0655fad06b372b820ecbdccf10a0f214fee0986dfeded"
         )]
+[assembly:
+InternalsVisibleTo(
+        "SharpCompress.Test.Portable, PublicKey=002400000480000094000000060200000024000052534131000400000100010005d6ae1b0f6875393da83c920a5b9408f5191aaf4e8b3c2c476ad2a11f5041ecae84ce9298bc4c203637e2fd3a80ad5378a9fa8da1363e98cea45c73969198a4b64510927c910001491cebbadf597b22448ad103b0a4007e339faf8fe8665dcdb70d65b27ac05b1977c0655fad06b372b820ecbdccf10a0f214fee0986dfeded"
+        )]
 #endif
\ No newline at end of file
diff --git a/SharpCompress/SharpCompress.PortableTest.csproj b/SharpCompress/SharpCompress.PortableTest.csproj
index a77ff958..bc9cf19a 100644
--- a/SharpCompress/SharpCompress.PortableTest.csproj
+++ b/SharpCompress/SharpCompress.PortableTest.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpCompress</RootNamespace>
-    <AssemblyName>SharpCompress</AssemblyName>
+    <AssemblyName>SharpCompress.PortableTest</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>
@@ -57,7 +57,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <NoWarn>1591</NoWarn>
-    <DocumentationFile>..\bin\SharpCompress.XML</DocumentationFile>
+    <DocumentationFile>..\bin\SharpCompress.PortableTest.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -68,7 +68,7 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>..\bin\SharpCompress.xml</DocumentationFile>
+    <DocumentationFile>..\bin\SharpCompress.PortableTest.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>