@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\runtime\Python.Runtime.csproj" />
+    <ProjectReference Include="..\testing\Python.Test.csproj" />
   </ItemGroup>
 
   <ItemGroup>
 
@@ -8,6 +8,7 @@
 using NUnit.Framework;
 
 using Python.Runtime;
+using Python.Test;
 
 namespace Python.PythonTestsRunner
 {
@@ -50,7 +51,7 @@ public void RunPythonTest(string testFile, string testName)
             {
                 folder = Path.GetDirectoryName(folder);
             }
-            folder = Path.Combine(folder, "tests");
+            folder = Path.Combine(folder, "..", "tests");
             string path = Path.Combine(folder, testFile + ".py");
             if (!File.Exists(path)) throw new FileNotFoundException("Cannot find test file", path);
 
 
@@ -31,6 +31,12 @@ def pytest_addoption(parser):
 
 def pytest_configure(config):
     global bin_path
+    if "clr" in sys.modules:
+        # Already loaded (e.g. by the C# test runner), skip build
+        import clr
+        clr.AddReference("Python.Test")
+        return
+
     runtime_opt = config.getoption("runtime")
 
     test_proj_path = os.path.join(cwd, "..", "src", "testing")
@@ -70,7 +76,10 @@ def pytest_configure(config):
 
 def pytest_unconfigure(config):
     global bin_path
-    shutil.rmtree(bin_path)
+    try:
+        shutil.rmtree(bin_path)
+    except Exception:
+        pass
 
 def pytest_report_header(config):
     """Generate extra report headers"""
Original file line number	Diff line number	Diff line change
@@ -8,6 +8,7 @@
8	8	using NUnit.Framework;
9	9
10	10	using Python.Runtime;
	11	+ using Python.Test;
11	12
12	13	namespace Python.PythonTestsRunner
13	14	{
@@ -50,7 +51,7 @@ public void RunPythonTest(string testFile, string testName)
50	51	{
51	52	folder = Path.GetDirectoryName(folder);
52	53	}
53		- folder = Path.Combine(folder, "tests");
	54	+ folder = Path.Combine(folder, "..", "tests");
54	55	string path = Path.Combine(folder, testFile + ".py");
55	56	if (!File.Exists(path)) throw new FileNotFoundException("Cannot find test file", path);
56	57