diff --git a/tests/CatalogTests/CatalogTests.csproj b/tests/CatalogTests/CatalogTests.csproj
index d67fa3f5c..338224a30 100644
--- a/tests/CatalogTests/CatalogTests.csproj
+++ b/tests/CatalogTests/CatalogTests.csproj
@@ -80,6 +80,8 @@
     <Compile Include="CatalogIndexReaderTests.cs" />
     <Compile Include="CatalogCommitTests.cs" />
     <Compile Include="CollectorHttpClientTests.cs" />
+    <Compile Include="Dnx\DnxCatalogCollectorTests.cs" />
+    <Compile Include="Dnx\DnxMakerTests.cs" />
     <Compile Include="Helpers\AsyncExtensionsTests.cs" />
     <Compile Include="Helpers\CatalogIndependentPage.cs" />
     <Compile Include="Helpers\CatalogIndex.cs" />
diff --git a/tests/NgTests/DnxCatalogCollectorTests.cs b/tests/CatalogTests/Dnx/DnxCatalogCollectorTests.cs
similarity index 99%
rename from tests/NgTests/DnxCatalogCollectorTests.cs
rename to tests/CatalogTests/Dnx/DnxCatalogCollectorTests.cs
index fb5dbd3a3..e3f27b92a 100644
--- a/tests/NgTests/DnxCatalogCollectorTests.cs
+++ b/tests/CatalogTests/Dnx/DnxCatalogCollectorTests.cs
@@ -21,7 +21,7 @@
 using NuGet.Services.Metadata.Catalog.Persistence;
 using Xunit;
 
-namespace NgTests
+namespace CatalogTests.Dnx
 {
     public class DnxCatalogCollectorTests
     {
diff --git a/tests/NgTests/DnxMakerTests.cs b/tests/CatalogTests/Dnx/DnxMakerTests.cs
similarity index 99%
rename from tests/NgTests/DnxMakerTests.cs
rename to tests/CatalogTests/Dnx/DnxMakerTests.cs
index f0dc73792..562264734 100644
--- a/tests/NgTests/DnxMakerTests.cs
+++ b/tests/CatalogTests/Dnx/DnxMakerTests.cs
@@ -17,7 +17,7 @@
 using NuGet.Versioning;
 using Xunit;
 
-namespace NgTests
+namespace CatalogTests.Dnx
 {
     public class DnxMakerTests
     {
diff --git a/tests/NgTests/NgTests.csproj b/tests/NgTests/NgTests.csproj
index f6b18e238..8a258ea78 100644
--- a/tests/NgTests/NgTests.csproj
+++ b/tests/NgTests/NgTests.csproj
@@ -63,8 +63,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>TestRegistrationEntries.resx</DependentUpon>
     </Compile>
-    <Compile Include="DnxCatalogCollectorTests.cs" />
-    <Compile Include="DnxMakerTests.cs" />
     <Compile Include="Feed2CatalogTests.cs" />
     <Compile Include="Infrastructure\MemoryStorage.cs" />
     <Compile Include="Infrastructure\MemoryStorageFactory.cs" />