diff --git a/test/src/WixTests/WixTests.csproj b/test/src/WixTests/WixTests.csproj
index 0b569715..ce2a508d 100644
--- a/test/src/WixTests/WixTests.csproj
+++ b/test/src/WixTests/WixTests.csproj
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
   <PropertyGroup>
     <ProjectGuid>{31FCC013-485E-487D-89D8-6C19EDCDD9A3}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -11,6 +10,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DisableSigning>true</DisableSigning>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -91,7 +92,6 @@
     <Compile Include="Integration\BuildingPackages\Bundle.RegistrySearchTests.cs" />
     <Compile Include="Integration\BuildingPackages\Bundle.ProductSearchTests.cs" />
     <Compile Include="Integration\BuildingPackages\Bundle.ComponentSearchTests.cs" />
-    <Compile Include="Integration\BuildingPackages\Bundle.LayoutTests.cs" />
     <Compile Include="Integration\BuildingPackages\Features.FeatureTests.cs" />
     <Compile Include="Integration\BuildingPackages\Features.RefAndGroupTests.cs" />
     <Compile Include="Integration\BuildingPackages\Files.CopyFileTests.cs" />
@@ -543,4 +543,10 @@
     </Content>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
-</Project>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/test/src/WixTests/packages.config b/test/src/WixTests/packages.config
index 6a060bae..be7a840a 100644
--- a/test/src/WixTests/packages.config
+++ b/test/src/WixTests/packages.config
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
 <packages>
   <package id="xunit" version="1.9.2" targetFramework="net40" />
-</packages>
+  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net40" />
+</packages>
\ No newline at end of file