diff --git a/xunit.runner.visualstudio.nuspec b/xunit.runner.visualstudio.nuspec
index 8a075f52..10ab5bcc 100644
--- a/xunit.runner.visualstudio.nuspec
+++ b/xunit.runner.visualstudio.nuspec
@@ -24,6 +24,9 @@ Supported platforms:
     <file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.runner.utility.desktop.dll"          target="build\_common\" />
     <file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.runner.visualstudio.testadapter.dll" target="build\_common\" />
     <file src="xunit.runner.visualstudio.wpa81\bin\Release\xunit.runner.utility.dotnet.dll"                 target="build\_common\" />
+	<file src="xunit.runner.visualstudio.testadapter\bin\Release\Newtonsoft.Json.dll"                 target="build\_common\" />
+	<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.core.dll"                 target="build\_common\" />
+	<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.execution.desktop.dll"                 target="build\_common\" />
 
     <file src="build\xunit.runner.visualstudio.v1.props" target="build\net20\xunit.runner.visualstudio.props" />
 
diff --git a/xunit.runner.visualstudio.testadapter/Sinks/VsDiscoverySink.cs b/xunit.runner.visualstudio.testadapter/Sinks/VsDiscoverySink.cs
index 15abbd34..fb647fe9 100644
--- a/xunit.runner.visualstudio.testadapter/Sinks/VsDiscoverySink.cs
+++ b/xunit.runner.visualstudio.testadapter/Sinks/VsDiscoverySink.cs
@@ -6,6 +6,8 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Xunit.Abstractions;
+using Xunit.Sdk;
+using Newtonsoft.Json;
 
 #if PLATFORM_DOTNET
 using System.Reflection;
@@ -65,14 +67,32 @@ public static TestCase CreateVsTestCase(string source, ITestFrameworkDiscoverer
         {
             try
             {
-                var serializedTestCase = discoverer.Serialize(xunitTestCase);
                 var fqTestMethodName = $"{xunitTestCase.TestMethod.TestClass.Class.Name}.{xunitTestCase.TestMethod.Method.Name}";
                 var uniqueName = forceUniqueNames ? $"{fqTestMethodName} ({xunitTestCase.UniqueID})" : fqTestMethodName;
 
                 var result = new TestCase(uniqueName, uri, source) { DisplayName = Escape(xunitTestCase.DisplayName) };
-                result.SetPropertyValue(VsTestRunner.SerializedTestCaseProperty, serializedTestCase);
+
+                if (VsTestRunner.AppDomain != AppDomainSupport.Denied)
+                {
+                    var serializedTestCase = discoverer.Serialize(xunitTestCase);
+                    result.SetPropertyValue(VsTestRunner.SerializedTestCaseProperty, serializedTestCase);
+                }
                 result.Id = GuidFromString(uri + xunitTestCase.UniqueID);
 
+                if (xunitTestCase.TestMethodArguments != null)
+                {
+                    var serializedTestArguments = JsonConvert.SerializeObject(xunitTestCase.TestMethodArguments, new JsonSerializerSettings
+                    {
+                        TypeNameHandling = TypeNameHandling.Auto
+                    });
+                    result.SetPropertyValue(VsTestRunner.SerializedTestCaseArgumentProperty, serializedTestArguments);
+                }
+
+                if (xunitTestCase is XunitTheoryTestCase)
+                {
+                    result.SetPropertyValue(VsTestRunner.TheoryAgrumentProperty, "Theory");
+                }
+
                 if (addTraitThunk != null)
                 {
                     foreach (var key in xunitTestCase.Traits.Keys)
diff --git a/xunit.runner.visualstudio.testadapter/Utility/AssemblyRunInfo.cs b/xunit.runner.visualstudio.testadapter/Utility/AssemblyRunInfo.cs
index 13c4a02c..95b25698 100644
--- a/xunit.runner.visualstudio.testadapter/Utility/AssemblyRunInfo.cs
+++ b/xunit.runner.visualstudio.testadapter/Utility/AssemblyRunInfo.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Xunit.Abstractions;
 
 namespace Xunit.Runner.VisualStudio
 {
@@ -8,5 +9,6 @@ public class AssemblyRunInfo
         public string AssemblyFileName;
         public TestAssemblyConfiguration Configuration;
         public IList<TestCase> TestCases;
+        public Dictionary<ITestCase, TestCase> TestCaseMap;
     }
 }
diff --git a/xunit.runner.visualstudio.testadapter/VsTestRunner.cs b/xunit.runner.visualstudio.testadapter/VsTestRunner.cs
index edbd7f1f..c4a44253 100644
--- a/xunit.runner.visualstudio.testadapter/VsTestRunner.cs
+++ b/xunit.runner.visualstudio.testadapter/VsTestRunner.cs
@@ -9,6 +9,9 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using Xunit.Abstractions;
+using System.Reflection;
+using Xunit.Sdk;
+using Newtonsoft.Json;
 
 #if !PLATFORM_DOTNET
 using System.Xml;
@@ -24,11 +27,13 @@ namespace Xunit.Runner.VisualStudio.TestAdapter
     public class VsTestRunner : ITestDiscoverer, ITestExecutor
     {
         public static TestProperty SerializedTestCaseProperty = GetTestProperty();
+        public static TestProperty SerializedTestCaseArgumentProperty = GetTestArgumentProperty();
+        public static TestProperty TheoryAgrumentProperty = GetTheoryAgrumentProperty();
 
 #if PLATFORM_DOTNET
-        static readonly AppDomainSupport AppDomainDefaultBehavior = AppDomainSupport.Denied;
+        internal static AppDomainSupport AppDomain = AppDomainSupport.Denied;
 #else
-        static readonly AppDomainSupport AppDomainDefaultBehavior = AppDomainSupport.Required;
+        internal static AppDomainSupport AppDomain = AppDomainSupport.Required;
 #endif
 
         static readonly HashSet<string> platformAssemblies = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
@@ -111,10 +116,16 @@ void ITestExecutor.RunTests(IEnumerable<TestCase> tests, IRunContext runContext,
             var stopwatch = Stopwatch.StartNew();
             var logger = new LoggerHelper(frameworkHandle, stopwatch);
 
+            Dictionary<ITestCase, TestCase> testCaseMap = null;
+            if (AppDomain == AppDomainSupport.Denied)
+            {
+                testCaseMap = GetXunitTestCaseMap(tests);
+            }
+
             RunTests(
                 runContext, frameworkHandle, logger,
                 () => tests.GroupBy(testCase => testCase.Source)
-                           .Select(group => new AssemblyRunInfo { AssemblyFileName = group.Key, Configuration = LoadConfiguration(group.Key), TestCases = group.ToList() })
+                           .Select(group => new AssemblyRunInfo { AssemblyFileName = group.Key, Configuration = LoadConfiguration(group.Key), TestCases = group.ToList(), TestCaseMap = testCaseMap })
                            .ToList()
             );
         }
@@ -257,6 +268,12 @@ static Stream GetConfigurationStreamForAssembly(string assemblyName)
         static TestProperty GetTestProperty()
             => TestProperty.Register("XunitTestCase", "xUnit.net Test Case", typeof(string), typeof(VsTestRunner));
 
+        static TestProperty GetTestArgumentProperty()
+          => TestProperty.Register("XunitTestCaseArgument", "xUnit.net Test Case Argument", typeof(string), typeof(object[]));
+
+        static TestProperty GetTheoryAgrumentProperty()
+            => TestProperty.Register("TheoryAgrument", "xUnit.net Theory Argument", typeof(string), typeof(object[]));
+
         List<AssemblyRunInfo> GetTests(IEnumerable<string> sources, LoggerHelper logger, IRunContext runContext)
         {
             // For store apps, the files are copied to the AppX dir, we need to load it from there
@@ -280,16 +297,45 @@ List<AssemblyRunInfo> GetTests(IEnumerable<string> sources, LoggerHelper logger,
                     vsFilteredTestCases = filterHelper.GetFilteredTestList(vsFilteredTestCases, runContext, logger, source).ToList();
 
                     // Re-create testcases with unique names if there is more than 1
-                    var testCases = visitor.TestCases.Where(tc => vsFilteredTestCases.Any(vsTc => vsTc.DisplayName == tc.DisplayName))
-                                                     .GroupBy(tc => $"{tc.TestMethod.TestClass.Class.Name}.{tc.TestMethod.Method.Name}")
-                                                     .SelectMany(group => group.Select(testCase => VsDiscoverySink.CreateVsTestCase(source, discoverer, testCase, forceUniqueNames: group.Count() > 1, logger: logger, knownTraitNames: knownTraitNames))
-                                                     .Where(vsTestCase => vsTestCase != null)).ToList(); // pre-enumerate these as it populates the known trait names collection
+                    Dictionary<ITestCase, TestCase> testCaseMap = null;
+                    List<TestCase> testCases = null;
+
+                    if (AppDomain == AppDomainSupport.Denied)
+                    {
+                        testCaseMap = visitor.TestCases.Where(tc => vsFilteredTestCases.Any(vsTc => vsTc.DisplayName == tc.DisplayName)).GroupBy(tc => $"{tc.TestMethod.TestClass.Class.Name}.{tc.TestMethod.Method.Name}")
+                                                           .SelectMany(group => group.Select((testCase, i) => new
+                                                           {
+                                                               testCase,
+                                                               v = VsDiscoverySink.CreateVsTestCase(
+                                                                                                           source,
+                                                                                                           discoverer,
+                                                                                                           testCase,
+                                                                                                           forceUniqueNames: group.Count() > 1,
+                                                                                                           logger: logger,
+                                                                                                           knownTraitNames: knownTraitNames)
+                                                           })).ToDictionary(x => x.testCase, x => x.v);
+
+                    }
+                    else
+                    {
+                        testCases = visitor.TestCases.Where(tc => vsFilteredTestCases.Any(vsTc => vsTc.DisplayName == tc.DisplayName)).GroupBy(tc => $"{tc.TestMethod.TestClass.Class.Name}.{tc.TestMethod.Method.Name}")
+                                                          .SelectMany(group => group.Select(testCase =>
+                                                                                                      VsDiscoverySink.CreateVsTestCase(
+                                                                                                          source,
+                                                                                                          discoverer,
+                                                                                                          testCase,
+                                                                                                          forceUniqueNames: group.Count() > 1,
+                                                                                                          logger: logger,
+                                                                                                          knownTraitNames: knownTraitNames))
+                                                          .Where(vsTestCase => vsTestCase != null)).ToList(); // pre-enumerate these as it populates the known trait names collection
+                    }
 
                     var runInfo = new AssemblyRunInfo
                     {
                         AssemblyFileName = source,
                         Configuration = LoadConfiguration(source),
-                        TestCases = testCases
+                        TestCases = testCases,
+                        TestCaseMap = testCaseMap
                     };
                     result.Add(runInfo);
                 }
@@ -377,9 +423,18 @@ void RunTestsInAssembly(IRunContext runContext,
                 var diagnosticMessageVisitor = new DiagnosticMessageSink(logger, assemblyDisplayName, runInfo.Configuration.DiagnosticMessagesOrDefault);
                 using (var controller = new XunitFrontController(appDomain, assemblyFileName: assemblyFileName, configFileName: null, shadowCopy: shadowCopy, diagnosticMessageSink: diagnosticMessageVisitor))
                 {
-                    var xunitTestCases = runInfo.TestCases.Select(tc => new { vs = tc, xunit = Deserialize(logger, controller, tc) })
-                                                          .Where(tc => tc.xunit != null)
-                                                          .ToDictionary(tc => tc.xunit, tc => tc.vs);
+                    Dictionary<ITestCase, TestCase> xunitTestCases;
+                    if (AppDomain == AppDomainSupport.Denied)
+                    {
+                        xunitTestCases = runInfo.TestCaseMap;
+                    }
+                    else
+                    {
+                        xunitTestCases = runInfo.TestCases.Select(tc => new { vs = tc, xunit = Deserialize(logger, controller, tc) })
+                                                              .Where(tc => tc.xunit != null)
+                                                              .ToDictionary(tc => tc.xunit, tc => tc.vs);
+                    }
+
 
                     var executionOptions = TestFrameworkOptions.ForExecution(runInfo.Configuration);
                     executionOptions.SetSynchronousMessageReporting(true);
@@ -452,6 +507,111 @@ IEnumerator IEnumerable.GetEnumerator()
             }
         }
 
+        Dictionary<ITestCase, TestCase> GetXunitTestCaseMap(IEnumerable<TestCase> tests)
+        {
+            // -- Get the xunit ITestCase from TestCase
+            Dictionary<ITestCase, TestCase> testcaselist = new Dictionary<ITestCase, TestCase>();
+
+            var dict = new Dictionary<string, Assembly>();
+            foreach (TestCase test in tests)
+            {
+                var asmName = test.Source.Substring(test.Source.LastIndexOf('\\') + 1, test.Source.LastIndexOf('.') - test.Source.LastIndexOf('\\') - 1);
+                Assembly asm = null;
+                if (!dict.ContainsKey(asmName))
+                {
+#if PLATFORM_DOTNET
+                    // todo : revisit this
+                    asm = Assembly.Load(new AssemblyName(asmName));
+#else
+                    asm = Assembly.LoadFrom(test.Source);
+#endif
+                    dict.Add(asmName, asm);
+                }
+                else
+                {
+                    asm = dict[asmName];
+                }
+
+                IAssemblyInfo assemblyInfo = new ReflectionAssemblyInfo(asm);
+                ITestAssembly testAssembly = new TestAssembly(assemblyInfo);
+
+                var lastIndexOfDot = test.FullyQualifiedName.LastIndexOf('.');
+                var testname = test.FullyQualifiedName.Split(' ')[0].Substring(lastIndexOfDot + 1);
+                var classname = test.FullyQualifiedName.Substring(0, lastIndexOfDot);
+
+                var methodClass = asm.GetType(classname);
+
+                ITypeInfo typeInfo = new ReflectionTypeInfo(methodClass);
+                TestCollection testCollection = new TestCollection(testAssembly, typeInfo, "Test collection for " + classname);
+                TestClass tc = new TestClass(testCollection, typeInfo);
+
+                //IMethodInfo
+#if PLATFORM_DOTNET
+                var methodinfos = methodClass.GetRuntimeMethods().ToList();
+#else
+                var methodinfos = methodClass.GetMethods().ToList();
+#endif
+
+                XunitTestCase xunitTestCase = null;
+                var serializedTestArgs = test.GetPropertyValue<string>(SerializedTestCaseArgumentProperty, null);
+
+
+                Object[] testarguments = serializedTestArgs == null ? null : JsonConvert.DeserializeObject<Object[]>(serializedTestArgs, new JsonSerializerSettings
+                {
+                    TypeNameHandling = TypeNameHandling.Auto
+                });
+
+                if (testarguments != null)
+                {
+                    testname = testname.Split('(')[0];
+                }
+
+
+                MethodInfo methodinfo = null;
+                for (int i = 0; i < methodinfos.Count(); i++)
+                {
+                    if (methodinfos[i].Name.Equals(testname))
+                    {
+                        methodinfo = methodinfos[i];
+                        break;
+                    }
+                }
+
+                ReflectionMethodInfo refMethodInfo = new ReflectionMethodInfo(methodinfo);
+                ITestMethod method = new TestMethod(tc, refMethodInfo);
+                NullMessageSink sink = new NullMessageSink();
+
+                if (testarguments == null && !string.IsNullOrEmpty(test.GetPropertyValue<string>(TheoryAgrumentProperty, null)))
+                {
+#if !PLATFORM_DOTNET
+                    Type type = typeof(XunitTheoryTestCase);
+                    ConstructorInfo ctor = (ConstructorInfo)type.GetConstructors().GetValue(1);
+                    xunitTestCase = (XunitTheoryTestCase)ctor.Invoke(new object[] { sink, 1, method });
+#else
+                    xunitTestCase = new XunitTheoryTestCase(sink, Xunit.Sdk.TestMethodDisplay.ClassAndMethod, method);
+
+#endif
+                }
+                else
+                {
+#if !PLATFORM_DOTNET
+                    Type type = typeof(XunitTestCase);
+                    ConstructorInfo ctor = (ConstructorInfo)type.GetConstructors().GetValue(1);
+                    xunitTestCase = (XunitTestCase)ctor.Invoke(new object[] { sink, 1, method, testarguments });
+#else
+                    xunitTestCase = new XunitTestCase(sink, Xunit.Sdk.TestMethodDisplay.ClassAndMethod, method, testarguments);
+#endif
+                }
+
+                xunitTestCase.SourceInformation = new SourceInformation();
+                xunitTestCase.SourceInformation.FileName = test.CodeFilePath;
+                xunitTestCase.SourceInformation.LineNumber = test.LineNumber;
+
+                testcaselist.Add(xunitTestCase, test);
+            }
+            return testcaselist;
+        }
+
         bool DisableAppDomainRequestedInRunContext(string settingsXml)
         {
 #if !PLATFORM_DOTNET
diff --git a/xunit.runner.visualstudio.testadapter/packages.config b/xunit.runner.visualstudio.testadapter/packages.config
index 74e0228f..2f3d955a 100644
--- a/xunit.runner.visualstudio.testadapter/packages.config
+++ b/xunit.runner.visualstudio.testadapter/packages.config
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.VisualStudio.TestPlatform.ObjectModel" version="0.0.6" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net35" />
+  <package id="xunit.core" version="2.2.0-beta3-build3335" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.2.0-beta3-build3335" targetFramework="net45" />
+  <package id="xunit.extensibility.execution" version="2.2.0-beta3-build3335" targetFramework="net45" />
   <package id="xunit.runner.utility" version="2.2.0-beta3-build3335" targetFramework="net35" />
 </packages>
\ No newline at end of file
diff --git a/xunit.runner.visualstudio.testadapter/xunit.runner.visualstudio.testadapter.csproj b/xunit.runner.visualstudio.testadapter/xunit.runner.visualstudio.testadapter.csproj
index 77a8ee2f..18b72669 100644
--- a/xunit.runner.visualstudio.testadapter/xunit.runner.visualstudio.testadapter.csproj
+++ b/xunit.runner.visualstudio.testadapter/xunit.runner.visualstudio.testadapter.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Xunit.Runner.VisualStudio.TestAdapter</RootNamespace>
     <AssemblyName>xunit.runner.visualstudio.testadapter</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -39,6 +39,10 @@
       <Private>False</Private>
       <HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.ObjectModel.0.0.6\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.XML" />
@@ -46,6 +50,14 @@
       <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="xunit.core, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0-beta3-build3335\lib\net45\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0-beta3-build3335\lib\net45\xunit.execution.desktop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="xunit.runner.utility.desktop, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\packages\xunit.runner.utility.2.2.0-beta3-build3335\lib\net35\xunit.runner.utility.desktop.dll</HintPath>
       <Private>True</Private>
@@ -72,7 +84,7 @@
     <Compile Include="VsTestRunner.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <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. 
diff --git a/xunit.runner.visualstudio.uwp/project.json b/xunit.runner.visualstudio.uwp/project.json
index 3349acc3..2a18ed08 100644
--- a/xunit.runner.visualstudio.uwp/project.json
+++ b/xunit.runner.visualstudio.uwp/project.json
@@ -2,6 +2,8 @@
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
     "Microsoft.VisualStudio.TestPlatform.ObjectModel": "0.0.6",
+    "Newtonsoft.Json": "9.0.1",
+    "xunit.core": "2.2.0-beta3-build3335",
     "xunit.runner.utility": "2.2.0-beta3-build3335"
   },
   "frameworks": {
diff --git a/xunit.runner.visualstudio.win81/packages.config b/xunit.runner.visualstudio.win81/packages.config
index 9af1f5bc..fefe3ec3 100644
--- a/xunit.runner.visualstudio.win81/packages.config
+++ b/xunit.runner.visualstudio.win81/packages.config
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.VisualStudio.TestPlatform.ObjectModel" version="0.0.6" targetFramework="win81" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="win81" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="win81" />
+  <package id="xunit.core" version="2.2.0-beta3-build3335" targetFramework="win81" />
+  <package id="xunit.extensibility.core" version="2.2.0-beta3-build3335" targetFramework="win81" />
+  <package id="xunit.extensibility.execution" version="2.2.0-beta3-build3335" targetFramework="win81" />
   <package id="xunit.runner.utility" version="2.2.0-beta3-build3335" targetFramework="win81" />
 </packages>
\ No newline at end of file
diff --git a/xunit.runner.visualstudio.win81/xunit.runner.visualstudio.win81.csproj b/xunit.runner.visualstudio.win81/xunit.runner.visualstudio.win81.csproj
index 65acfa2a..488bbdcf 100644
--- a/xunit.runner.visualstudio.win81/xunit.runner.visualstudio.win81.csproj
+++ b/xunit.runner.visualstudio.win81/xunit.runner.visualstudio.win81.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\xunit.core.2.2.0-beta3-build3335\build\win81\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.2.0-beta3-build3335\build\win81\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,10 +42,22 @@
       <Private>False</Private>
       <HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.ObjectModel.0.0.6\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="xunit.core, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0-beta3-build3335\lib\netstandard1.0\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.dotnet, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0-beta3-build3335\lib\netstandard1.0\xunit.execution.dotnet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="xunit.runner.utility.dotnet, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\packages\xunit.runner.utility.2.2.0-beta3-build3335\lib\netstandard1.1\xunit.runner.utility.dotnet.dll</HintPath>
       <Private>True</Private>
@@ -111,6 +124,12 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <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.core.2.2.0-beta3-build3335\build\win81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.2.0-beta3-build3335\build\win81\xunit.core.props'))" />
+  </Target>
   <!-- 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.
   <Target Name="BeforeBuild">
diff --git a/xunit.runner.visualstudio.wpa81/packages.config b/xunit.runner.visualstudio.wpa81/packages.config
index 64325f60..d3db6f96 100644
--- a/xunit.runner.visualstudio.wpa81/packages.config
+++ b/xunit.runner.visualstudio.wpa81/packages.config
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.VisualStudio.TestPlatform.ObjectModel" version="0.0.6" targetFramework="wpa81" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="wpa81" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="wpa81" />
+  <package id="xunit.core" version="2.2.0-beta3-build3335" targetFramework="wpa81" />
+  <package id="xunit.extensibility.core" version="2.2.0-beta3-build3335" targetFramework="wpa81" />
+  <package id="xunit.extensibility.execution" version="2.2.0-beta3-build3335" targetFramework="wpa81" />
   <package id="xunit.runner.utility" version="2.2.0-beta3-build3335" targetFramework="wpa81" />
 </packages>
\ No newline at end of file
diff --git a/xunit.runner.visualstudio.wpa81/xunit.runner.visualstudio.wpa81.csproj b/xunit.runner.visualstudio.wpa81/xunit.runner.visualstudio.wpa81.csproj
index ab6010b1..ff397683 100644
--- a/xunit.runner.visualstudio.wpa81/xunit.runner.visualstudio.wpa81.csproj
+++ b/xunit.runner.visualstudio.wpa81/xunit.runner.visualstudio.wpa81.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\xunit.core.2.2.0-beta3-build3335\build\wpa81\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.2.0-beta3-build3335\build\wpa81\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,7 +17,8 @@
     <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>23a908a7</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -96,17 +98,29 @@
       <Private>False</Private>
       <HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.ObjectModel.0.0.6\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="xunit.core, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.2.0-beta3-build3335\lib\netstandard1.0\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.dotnet, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.2.0-beta3-build3335\lib\netstandard1.0\xunit.execution.dotnet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="xunit.runner.utility.dotnet, Version=2.2.0.3335, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\packages\xunit.runner.utility.2.2.0-beta3-build3335\lib\netstandard1.1\xunit.runner.utility.dotnet.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config" />    
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
@@ -115,6 +129,12 @@
     <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <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.core.2.2.0-beta3-build3335\build\wpa81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.2.0-beta3-build3335\build\wpa81\xunit.core.props'))" />
+  </Target>
   <!-- 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.
   <Target Name="BeforeBuild">