diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/Properties/AssemblyInfo.cs
rename to ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/Properties/AssemblyInfo.cs
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/RichTextBox/Formatters/HtmlFormatterTests.cs b/ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/RichTextBox/Formatters/HtmlFormatterTests.cs
similarity index 100%
rename from ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/RichTextBox/Formatters/HtmlFormatterTests.cs
rename to ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/RichTextBox/Formatters/HtmlFormatterTests.cs
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/Xceed.Wpf.Toolkit.Tests.csproj b/ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/Xceed.Wpf.Toolkit.Tests.csproj
similarity index 91%
rename from ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/Xceed.Wpf.Toolkit.Tests.csproj
rename to ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/Xceed.Wpf.Toolkit.Tests.csproj
index 93874f2b..0764c862 100644
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/Xceed.Wpf.Toolkit.Tests.csproj
+++ b/ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/Xceed.Wpf.Toolkit.Tests.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -44,14 +44,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
+    <ProjectReference Include="..\..\Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
       <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
       <Name>Xceed.Wpf.Toolkit</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/packages.config b/ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/packages.config
new file mode 100644
index 00000000..967e817f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Tests/Xceed.Wpf.Toolkit.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="3.9.0" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/packages.config b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/packages.config
deleted file mode 100644
index 8e3be789..00000000
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.6.1" targetFramework="net45" />
-</packages>
\ No newline at end of file