diff --git a/Nuclex.Support (netstandard-2.0).csproj b/Nuclex.Support (netstandard-2.0).csproj
index 633728f..3b73318 100644
--- a/Nuclex.Support (netstandard-2.0).csproj	
+++ b/Nuclex.Support (netstandard-2.0).csproj	
@@ -7,6 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <AssemblyName>Nuclex.Support</AssemblyName>
     <RootNamespace>Nuclex.Support</RootNamespace>
+    <IntermediateOutputPath>obj\source</IntermediateOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Nuclex.Support.Tests (netstandard-2.0).csproj b/Nuclex.Support.Tests (netstandard-2.0).csproj
new file mode 100644
index 0000000..54b3bfd
--- /dev/null
+++ b/Nuclex.Support.Tests (netstandard-2.0).csproj	
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <AssemblyName>Nuclex.Support.Tests</AssemblyName>
+    <RootNamespace>Nuclex.Support.Tests</RootNamespace>
+    <IntermediateOutputPath>obj\tests</IntermediateOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Source\**" />
+    <EmbeddedResource Remove="Source\**" />
+    <None Remove="Source\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove=".git" />
+    <None Remove="packages.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="Nuclex.Support (netstandard-2.0).csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Castle.Core">
+      <HintPath>..\third-party\castle.core-5.1.1\netstandard-2.0\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="NSubstitute">
+      <HintPath>..\third-party\nsubstitute-5.1.0\netstandard-2.0\NSubstitute.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\third-party\nunit-3.14.0\netstandard-2.0\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>
diff --git a/Tests/EnumHelperTest.cs b/Tests/EnumHelperTest.cs
index ae9e890..6f86a3f 100644
--- a/Tests/EnumHelperTest.cs
+++ b/Tests/EnumHelperTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.IO;
 
@@ -119,5 +117,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/FloatHelperTest.cs b/Tests/FloatHelperTest.cs
index 2a94b8f..7fc9cfb 100644
--- a/Tests/FloatHelperTest.cs
+++ b/Tests/FloatHelperTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.Collections.Generic;
 
@@ -261,5 +259,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/IntegerHelperTest.cs b/Tests/IntegerHelperTest.cs
index 1a0fd38..b877b6d 100644
--- a/Tests/IntegerHelperTest.cs
+++ b/Tests/IntegerHelperTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.Collections.Generic;
 
@@ -125,5 +123,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/ObservableHelperTest.cs b/Tests/ObservableHelperTest.cs
index c574633..2785370 100644
--- a/Tests/ObservableHelperTest.cs
+++ b/Tests/ObservableHelperTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 
 using NUnit.Framework;
@@ -86,5 +84,3 @@ namespace Nuclex.Support {
   }
 
 }
-
-#endif // UNITTEST
diff --git a/Tests/ObservableTest.cs b/Tests/ObservableTest.cs
index dd31bd5..b9a5142 100644
--- a/Tests/ObservableTest.cs
+++ b/Tests/ObservableTest.cs
@@ -17,13 +17,10 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.ComponentModel;
 
 using NUnit.Framework;
-using NMock;
 
 namespace Nuclex.Support {
 
@@ -167,5 +164,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/PathHelperTest.cs b/Tests/PathHelperTest.cs
index 686c994..076d5bb 100644
--- a/Tests/PathHelperTest.cs
+++ b/Tests/PathHelperTest.cs
@@ -20,8 +20,6 @@ limitations under the License.
 using System;
 using System.IO;
 
-#if UNITTEST
-
 using NUnit.Framework;
 
 namespace Nuclex.Support {
@@ -242,5 +240,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/PropertyChangeEventArgsHelperTest.cs b/Tests/PropertyChangeEventArgsHelperTest.cs
index b8cd871..e024e9a 100644
--- a/Tests/PropertyChangeEventArgsHelperTest.cs
+++ b/Tests/PropertyChangeEventArgsHelperTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.ComponentModel;
 
@@ -120,5 +118,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/SharedTest.cs b/Tests/SharedTest.cs
index 6724cf2..20e7634 100644
--- a/Tests/SharedTest.cs
+++ b/Tests/SharedTest.cs
@@ -20,8 +20,6 @@ limitations under the License.
 using System;
 using System.IO;
 
-#if UNITTEST
-
 using NUnit.Framework;
 
 namespace Nuclex.Support {
@@ -64,5 +62,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/StringBuilderHelperTest.cs b/Tests/StringBuilderHelperTest.cs
index e199a8f..0b9cc89 100644
--- a/Tests/StringBuilderHelperTest.cs
+++ b/Tests/StringBuilderHelperTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -370,5 +368,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/StringHelperTest.cs b/Tests/StringHelperTest.cs
index 4f17300..145eba0 100644
--- a/Tests/StringHelperTest.cs
+++ b/Tests/StringHelperTest.cs
@@ -20,8 +20,6 @@ limitations under the License.
 using System;
 using System.IO;
 
-#if UNITTEST
-
 using NUnit.Framework;
 
 namespace Nuclex.Support {
@@ -212,5 +210,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/StringSegmentTest.cs b/Tests/StringSegmentTest.cs
index 7c24732..107850d 100644
--- a/Tests/StringSegmentTest.cs
+++ b/Tests/StringSegmentTest.cs
@@ -20,8 +20,6 @@ limitations under the License.
 using System;
 using System.IO;
 
-#if UNITTEST
-
 using NUnit.Framework;
 
 namespace Nuclex.Support {
@@ -207,5 +205,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/TypeHelperTest.cs b/Tests/TypeHelperTest.cs
index 19c6f20..a1ecd7c 100644
--- a/Tests/TypeHelperTest.cs
+++ b/Tests/TypeHelperTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.Reflection;
 
@@ -88,7 +86,7 @@ namespace Nuclex.Support {
     #region class HasIgnoreAttribute
 
     /// <summary>Class that carries an IgnoreAttribute</summary>
-    [Ignore]
+    [Ignore("Just misusing NUnit's IgnoreAttribute to have an attribute to test against")]
     private class HasIgnoreAttribute { }
 
     #endregion // class HasIgnoreAttribute
@@ -137,5 +135,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/WeakReferenceTest.cs b/Tests/WeakReferenceTest.cs
index 690e849..a9db28c 100644
--- a/Tests/WeakReferenceTest.cs
+++ b/Tests/WeakReferenceTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
@@ -109,5 +107,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST
diff --git a/Tests/XmlHelperTest.cs b/Tests/XmlHelperTest.cs
index bc73287..eedd5d3 100644
--- a/Tests/XmlHelperTest.cs
+++ b/Tests/XmlHelperTest.cs
@@ -17,8 +17,6 @@ limitations under the License.
 */
 #endregion // Apache License 2.0
 
-#if UNITTEST
-
 using System;
 using System.IO;
 using System.Text;
@@ -309,5 +307,3 @@ namespace Nuclex.Support {
   }
 
 } // namespace Nuclex.Support
-
-#endif // UNITTEST