diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
index 816b567c2e6537..ae1d12d57b0f84 100644
--- a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
+++ b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
@@ -305,10 +305,15 @@ private static string GenerateStandaloneSimpleTestRunner(ImmutableArray<ITestInf
         ITestReporterWrapper reporter = new NoTestReporting();
         StringBuilder builder = new();
         builder.AppendLine(string.Join("\n", aliasMap.Values.Where(alias => alias != "global").Select(alias => $"extern alias {alias};")));
+        builder.AppendLine("namespace __GeneratedMainWrapper;");
+        builder.AppendLine("class __GeneratedMainWrapper {");
+        builder.AppendLine("public static int Main() {");
         builder.AppendLine("try {");
         builder.AppendLine(string.Join("\n", testInfos.Select(m => m.GenerateTestExecution(reporter))));
         builder.AppendLine("} catch(System.Exception ex) { System.Console.WriteLine(ex.ToString()); return 101; }");
         builder.AppendLine("return 100;");
+        builder.AppendLine("}");
+        builder.AppendLine("}");
         return builder.ToString();
     }
 
diff --git a/src/tests/Loader/classloader/Casting/punning.cs b/src/tests/Loader/classloader/Casting/punning.cs
index 3971a781578b73..01064d2f268229 100644
--- a/src/tests/Loader/classloader/Casting/punning.cs
+++ b/src/tests/Loader/classloader/Casting/punning.cs
@@ -9,7 +9,7 @@
 partial class Program
 {
     [Fact]
-    static void Via_GetFunctionPointer()
+    internal static void Via_GetFunctionPointer()
     {
         Console.WriteLine($"Running {nameof(Via_GetFunctionPointer)}...");
 
@@ -24,7 +24,7 @@ static void Via_GetFunctionPointer()
     }
 
     [Fact]
-    static void Via_GetFunctionPointer_Generics()
+    internal static void Via_GetFunctionPointer_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_GetFunctionPointer_Generics)}...");
 
@@ -39,7 +39,7 @@ static void Via_GetFunctionPointer_Generics()
     }
 
     [Fact]
-    static void Via_Ldftn()
+    internal static void Via_Ldftn()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn)}...");
 
@@ -54,7 +54,7 @@ static void Via_Ldftn()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics()
+    internal static void Via_Ldftn_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics)}...");
 
@@ -69,7 +69,7 @@ static void Via_Ldftn_Generics()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_Virtual()
+    internal static void Via_Ldftn_Generics_Virtual()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual)}...");
 
@@ -85,7 +85,7 @@ static void Via_Ldftn_Generics_Virtual()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_EarlyLoad()
+    internal static void Via_Ldftn_Generics_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_EarlyLoad)}...");
 
@@ -100,7 +100,7 @@ static void Via_Ldftn_Generics_EarlyLoad()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_Virtual_EarlyLoad()
+    internal static void Via_Ldftn_Generics_Virtual_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual_EarlyLoad)}...");
 
@@ -116,7 +116,7 @@ static void Via_Ldftn_Generics_Virtual_EarlyLoad()
     }
 
     [Fact]
-    static void Via_Ldvirtftn()
+    internal static void Via_Ldvirtftn()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn)}...");
 
@@ -132,7 +132,7 @@ static void Via_Ldvirtftn()
     }
 
     [Fact]
-    static void Via_Ldvirtftn_Generics()
+    internal static void Via_Ldvirtftn_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics)}...");
 
@@ -148,7 +148,7 @@ static void Via_Ldvirtftn_Generics()
     }
 
     [Fact]
-    static void Via_Ldvirtftn_Generics_EarlyLoad()
+    internal static void Via_Ldvirtftn_Generics_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics_EarlyLoad)}...");
 
diff --git a/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs b/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs
index 9a3b9e9e15f183..dc3c30f108e612 100644
--- a/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs
+++ b/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Xunit;
 
 public class DeadThreads
 {
@@ -34,7 +35,8 @@ private static void StartNoOpThread()
         t.Start();
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         GCTriggerSanityTest();
         return 100;
diff --git a/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj b/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj
index 595107279fe40e..230a32de42e06b 100644
--- a/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj
+++ b/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestEnvironmentVariable -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/baseservices/threading/Directory.Build.props b/src/tests/baseservices/threading/Directory.Build.props
new file mode 100644
index 00000000000000..118a6455c09b8b
--- /dev/null
+++ b/src/tests/baseservices/threading/Directory.Build.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <BuildAsStandalone Condition="'$(BuildAsStandalone)' == ''">false</BuildAsStandalone>
+
+    <AssemblyName Condition="'$(BuildAsStandalone)' != 'true'">$(MSBuildProjectName.Replace('_il_d', '').Replace('_il_r', ''))</AssemblyName>
+  </PropertyGroup>
+
+  <Import Project="..\..\Directory.Build.props" />
+</Project>
\ No newline at end of file
diff --git a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
index fbd68c3226c8bc..fe5daeebb38d02 100644
--- a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
+++ b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
@@ -6,12 +6,14 @@
 using System.Text;
 // using System.Configuration;
 using System.Runtime.InteropServices;
+using Xunit;
 
 namespace StackCommitTest
 {
-    class DefaultStackCommit
+    public class DefaultStackCommit
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int result = 1;
             bool commitEnabled = false;
diff --git a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
index 352498419f392f..82f065f115cf4b 100644
--- a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
+++ b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs
index f99957df498512..f078a6f95d1ff4 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int 		  rValue = 100;
 		AutoResetEvent    are  = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
index 23dca2e0b3d226..f08305e7eda54f 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs
index 71a02b315e9ace..e187d0c8a58628 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int 		  rValue = 100;
 		ManualResetEvent  mre  = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
index 01275995abd14f..427ee54a15e575 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs
index 678d5e1bb1bde5..8c5dad7c082499 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int    rValue = 100;
 		Mutex  mut    = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
index df78acb3a48785..d6abd3d56c902f 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs
index a7154325180a60..8a7365d4a4100b 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                   rValue = 100;
 		RegisteredWaitHandle  rwh    = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
index b9390fb008c094..729e8bdc69c804 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs
index 25fd930dd69868..f5e70573256201 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs
@@ -4,9 +4,11 @@
 using System.Threading;
 // using System.Runtime.Remoting;
 using System.Runtime.Serialization;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                           rValue = 100;
 		SynchronizationLockException  sle    = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
index 740ba2b27b8caf..0ec448853a1f7e 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs
index 62c699e668c6c1..19980759fd9e62 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs
@@ -3,9 +3,11 @@
 using System;
 using System.Threading;
 using System.Runtime.Serialization;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                      rValue = 100;
 		ThreadStateException     ta     = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
index bda02790526976..090372d40f043a 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs
index 46c5f1daf813c8..3e6c5d1767b8b8 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		
 		int   rValue = 100;
 		Timer time   = null;
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
index c200e8c14ca75a..e08c848bfefcde 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs
index e11717ea2e66f2..3cdd7ffe4d1d77 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int         rValue = 100;
 		WaitHandle  wh     = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
index 4ce88027473a2d..d36d906358638a 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs b/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs
index 822bf16808971d..540e9d186a5247 100644
--- a/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs
+++ b/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading;
+using Xunit;
 
 namespace Threading.Tests
 {
@@ -12,7 +13,8 @@ public sealed class OSThreadId
         private static ManualResetEvent s_resetEvent = new ManualResetEvent(false);
         private static ulong[] s_threadIds = new ulong[NumThreads];
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             // The property to be tested is internal.
             Type runtimeThreadType = typeof(object).Assembly.GetType("System.Threading.Thread");
diff --git a/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj b/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
index 817c6757530215..63068c89c6c335 100644
--- a/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
+++ b/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs
index 78143a56bb83f5..621f3ded221c86 100644
--- a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs
+++ b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 namespace DelegateTest
 {
@@ -13,10 +14,11 @@ public static string TestMethod(int input)
         }
     }
 
-    class BeginInvokeEndInvokeTest
+    public class BeginInvokeEndInvokeTest
     {
         public delegate string AsyncMethodCaller(int input);
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             IAsyncResult result = null;
             AsyncMethodCaller caller = new AsyncMethodCaller(DelegateCommon.TestMethod);
diff --git a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
index c2cc2cbbb03d5e..606943bf75e949 100644
--- a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
+++ b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit01.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit01.cs
index 311959e45f61cf..e88276b27eb7cd 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit01.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public struct ValX1<T> {}
 public class RefX1<T> {}
@@ -51,7 +52,8 @@ public static void Eval(bool exp)
 		}
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit01.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit01.csproj
index acfabb39f1eb0c..6f34323213d725 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit01.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit01.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit02.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit02.cs
index 261e61fd49e2a7..41d92a203a81ff 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit02.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -66,7 +67,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit02.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit02.csproj
index 647cbfea43ebec..224b12b8e5e0bd 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit02.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit02.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit03.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit03.cs
index 3ded9033485a55..f538caf4a2fa5f 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit03.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -56,7 +57,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit03.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit03.csproj
index a3d953b9071ce6..0533d1a91b3779 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit03.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit03.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit04.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit04.cs
index dea58d7ca1b53d..f9489573c86882 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit04.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -71,7 +72,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit04.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit04.csproj
index 7207cd5bba80b7..0049ea7f9febfa 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit04.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit04.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit05.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit05.cs
index f4985309cbfecc..d58350fdf2a6db 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit05.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -56,7 +57,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit05.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit05.csproj
index 9ce8fdfb554aee..2b581d6c12de07 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit05.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit05.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit06.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit06.cs
index 9da0e3a3e04f69..2e386aeaaab32e 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit06.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -70,7 +71,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit06.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit06.csproj
index 829499bcefd157..7ace62ca5543e3 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit06.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit06.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit07.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit07.cs
index 133ee564f59893..f0dfe972674b23 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit07.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit07.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit07.csproj
index 73e20e2c4c33b0..87095f9e02aae3 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit07.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit07.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit08.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit08.cs
index 5190177e46c443..0abe2509ea307a 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit08.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -70,7 +71,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit08.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit08.csproj
index 1920b4fe589107..04c89f6af840e4 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit08.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit08.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit09.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit09.cs
index c551a867443386..e0a4b8b8f19498 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit09.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public struct ValX1<T> {}
 public class RefX1<T> {}
@@ -54,7 +55,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit09.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit09.csproj
index b20970d6309884..b2937b275731a9 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit09.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit09.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit10.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit10.cs
index 9dbacbcbd1501b..ca99f6631707e5 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit10.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -70,7 +71,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit10.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit10.csproj
index d918c43589ad1a..627d3bf59383b5 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit10.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit10.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit11.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit11.cs
index 9c600998cc457c..77fa6d3024b276 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit11.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -59,7 +60,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit11.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit11.csproj
index ed9cc818cd3b11..7ecc2300b39bd3 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit11.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit11.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit12.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit12.cs
index 6ffbcee55e4891..2768677d93aa75 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit12.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -78,7 +79,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit12.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit12.csproj
index 222d17c20a33f2..e2bfbeceb41e88 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit12.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit12.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit13.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit13.cs
index 30e249b788ddd2..d2ec36cbc177bf 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit13.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -58,7 +59,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit13.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit13.csproj
index 939abd4a9acf2e..93f7eb65cb03b8 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit13.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit13.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit14.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit14.cs
index 9fd7e47402429f..dc2cd3d6c8d5be 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit14.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -77,7 +78,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit14.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit14.csproj
index 85402dee303db1..133ea2660b65c4 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit14.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit14.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter01.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter01.cs
index 77c7b4cdca9425..68cc238984bbe2 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter01.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest();	
 		Gen<double>.TryEnterTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter01.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter01.csproj
index 68727fa98b74e0..480a89b16203f3 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter01.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter01.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter03.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter03.cs
index ee4173c290f556..5adde65af35473 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter03.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public struct ValX1<T> {}
 public class RefX1<T> {}
@@ -68,7 +69,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest<int>(true);	
 		Gen<double>.TryEnterTest<int>(false);
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter03.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter03.csproj
index 4cbbc02401707f..52b379827838df 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter03.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter03.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter04.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter04.cs
index 5d6ecbd91b807e..a8f7a936e9d980 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter04.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -56,7 +57,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest();	
 		/*Gen<double>.TryEnterTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter04.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter04.csproj
index 55f73e2923c0a9..b516e43e848acf 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter04.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter04.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter05.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter05.cs
index 3b7003daaae674..af08ccdd83d2cf 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter05.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -56,7 +57,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest();	
 		Gen<double>.TryEnterTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter05.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter05.csproj
index 4557dfbd9b975b..caf7d507aa99d6 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter05.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter05.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter06.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter06.cs
index 2922f74f01fea1..85b54d97326779 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter06.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -68,7 +69,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest<int>(true);	
 		Gen<double>.TryEnterTest<int>(false);
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter06.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter06.csproj
index 3c829b34023f0d..035829374ff029 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter06.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter06.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread01.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread01.cs
index cdccb8c48d66d0..0ae15a98629bd1 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread01.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread01.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread01_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread01.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread01_TimerCallback.csproj
index e4f858a0396ea8..10b6b39f924b16 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread01.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread01_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread02.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread02.cs
index 5c27e795b1b43c..f78de589ab3ccb 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread02.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread02.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread02_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread02.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread02_TimerCallback.csproj
index 430250b3746792..23f16bffe07305 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread02.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread02_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread03.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread03.cs
index f51e660862aba1..fe098311054ba5 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread03.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread03.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread03_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread03.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread03_TimerCallback.csproj
index d98eb265922c56..b187d3788ccb76 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread03.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread03_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread04.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread04.cs
index eb3818e114fd41..4784adfe3eb2cf 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread04.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread04.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread04_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread04.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread04_TimerCallback.csproj
index 453633a74c171a..f2096a4caf5440 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread04.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread04_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread05.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread05.cs
index c5857118231316..423b29e3d47222 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread05.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread05.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread05_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread05.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread05_TimerCallback.csproj
index c5fee6a26f374a..a05d0f9a722627 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread05.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread05_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread06.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread06.cs
index aa289ee6dd36af..9ae4c1957fd5ef 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread06.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread06.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread06_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread06.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread06_TimerCallback.csproj
index 10eb2b26b956f0..cb053f555a4522 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread06.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread06_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread07.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread07.cs
index d87b4574adf9f7..77fb276111740f 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread07.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread07.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread07_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread07.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread07_TimerCallback.csproj
index 450d6df55dcc3f..1f50accfe0ea18 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread07.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread07_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread08.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread08.cs
index df92b209142b4a..c4d9fe24ffaa73 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread08.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread08.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread08_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread08.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread08_TimerCallback.csproj
index 5f82b863555899..1d1b003dbaa67e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread08.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread08_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread09.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread09.cs
index 5b47dcb91b5004..0a031c2cdf3373 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread09.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread09.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread09_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread09.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread09_TimerCallback.csproj
index 15757e66ca2647..bb56217eeec1dd 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread09.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread09_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread10.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread10.cs
index ed180b2bc3003e..3fe085b9af464c 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread10.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -62,7 +63,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread10.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread10_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread10.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread10_TimerCallback.csproj
index 50c9f8b577af16..7beeeef8f8b5d0 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread10.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread10_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread11.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread11.cs
index 3af2a7a3f47057..3c6bbcb83cc0de 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread11.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -62,7 +63,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread11.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread11_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread11.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread11_TimerCallback.csproj
index ba2c41a9bf60bb..8e0e7d51593ba8 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread11.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread11_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread12.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread12.cs
index a359021400578f..9becce63e77344 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread12.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -62,7 +63,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread12.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread12_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread12.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread12_TimerCallback.csproj
index 34ad355611a30d..49cd594843a3dc 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread12.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread12_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread13.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread13.cs
index f9df296102618f..729188cd81da16 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread13.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread13.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread13_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread13.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread13_TimerCallback.csproj
index 9733eb9173eb42..de3ea8b6624782 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread13.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread13_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread14.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread14.cs
index 7b8047e7ed7834..b0dbd4cf1086b3 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread14.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread14.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread14_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread14.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread14_TimerCallback.csproj
index 64f08c0b44d426..f2f3aef1b36732 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread14.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread14_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread15.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread15.cs
index 9b9bad5de7fecb..de800f797fa05e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread15.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread15.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread15.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread15_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread15.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread15_TimerCallback.csproj
index 046dddf9fa55f6..8e4fd42c9c1fbb 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread15.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread15_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread16.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread16.cs
index c47df05d69cd6e..559645f09892c3 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread16.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread16.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread16.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread16_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread16.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread16_TimerCallback.csproj
index 3153426f406209..b5f0f4927bd2da 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread16.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread16_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread17.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread17.cs
index a0850a6be244de..e9ca3eac44582d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread17.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread17.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread17.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread17_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread17.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread17_TimerCallback.csproj
index e96370c26a6256..04d2777ffb7cf3 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread17.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread17_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread18.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread18.cs
index 0e1698112be655..a958a0f47ea126 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread18.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread18.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread18.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread18_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread18.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread18_TimerCallback.csproj
index bf32e098685567..b4ccb87122f70d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread18.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread18_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread19.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread19.cs
index 03c148ed10e5f3..de5d8ec653deb6 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread19.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread19.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread19.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread19_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread19.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread19_TimerCallback.csproj
index bfd9fc34c62174..d7de30cfe127c3 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread19.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread19_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread20.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread20.cs
index 0e1ad886c9967c..4fedb62e94d10b 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread20.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread20.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread20.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread20_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread20.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread20_TimerCallback.csproj
index 78af0fab8811ce..d804dc9b48454d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread20.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread20_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread21.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread21.cs
index 7b4cd643f33048..ae67c74d7e1bc1 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread21.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread21.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread21.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread21_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread21.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread21_TimerCallback.csproj
index a82f9e176a457d..69773fa6f02250 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread21.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread21_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread22.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread22.cs
index 130d9a30540eac..312bb5a6e7bea4 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread22.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread22.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread22.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread22_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread22.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread22_TimerCallback.csproj
index 0fa4c6c2bd2f71..a050afe11f830e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread22.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread22_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread23.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread23.cs
index 8275435e1a2e38..12caebd477b22e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread23.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread23.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread23.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread23_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread23.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread23_TimerCallback.csproj
index 959010726defa2..2e859a958875ea 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread23.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread23_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread24.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread24.cs
index 62edd7f2af212b..2875c278b15084 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread24.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread24.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread24.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread24_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread24.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread24_TimerCallback.csproj
index 16e4591936d94a..382efde9c1a864 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread24.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread24_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread25.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread25.cs
index 85ea674dc98e58..458964cde7ee15 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread25.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread25.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -51,7 +52,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread25.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread25_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread25.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread25_TimerCallback.csproj
index 3d8dcb8d4e1649..20ef63e37fb615 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread25.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread25_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread26.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread26.cs
index a5741d6050308d..2cd92a24420c1d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread26.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread26.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -51,7 +52,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread26.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread26_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread26.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread26_TimerCallback.csproj
index 044a653ba09d8f..05e934b6702bc9 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread26.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread26_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread27.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread27.cs
index 20ea033473a816..5a479c9c3799ea 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread27.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread27.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread27.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread27_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread27.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread27_TimerCallback.csproj
index fa0d5d43ff3516..7fcfdd560ff756 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread27.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread27_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread28.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread28.cs
index 40c2dc5192de25..a851ea43a55a1e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread28.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread28.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread28.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread28_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread28.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread28_TimerCallback.csproj
index 92d827a4ee2a2f..38ccf9fb4ab21e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread28.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread28_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread29.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread29.cs
index 1af5611b50781d..ba2cceec76c548 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread29.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread29.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread29.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread29_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread29.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread29_TimerCallback.csproj
index 03cd03474ed7f1..f20026fba40834 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread29.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread29_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread30.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread30.cs
index 5b88af47d1141c..64f694ce43f3ed 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread30.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread30.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread30.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread30_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread30.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread30_TimerCallback.csproj
index 4f36d7325676fe..5c20d5b6e4e9c6 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread30.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread30_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.cs b/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.cs
index 5657841d17e837..2d7edd2a20244f 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Threading;
 using System.Diagnostics;
+using Xunit;
 
 //namespace TimerCallbackTests ////////////// added this namesp
 
@@ -62,7 +63,8 @@ public class Test
 	public static bool result = true;
 	public static int timeToRun = 5000;
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj b/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
index 282237c6aabba6..15d567ff148779 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread01.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread01.cs
index c23a74a54ad680..d0885c63b6cbd7 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread01.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread01.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread01_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread01.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread01_WaitCallback.csproj
index e4f858a0396ea8..10b6b39f924b16 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread01.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread01_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread02.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread02.cs
index cfb0f0350017d9..2773fb455e2236 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread02.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread02.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread02_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread02.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread02_WaitCallback.csproj
index 430250b3746792..23f16bffe07305 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread02.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread02_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread03.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread03.cs
index bdc0faad30e442..6864b527b11295 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread03.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread03.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread03_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread03.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread03_WaitCallback.csproj
index d98eb265922c56..b187d3788ccb76 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread03.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread03_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread04.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread04.cs
index 33c0f717d1ca30..ea669ad05a51e2 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread04.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread04.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread04_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread04.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread04_WaitCallback.csproj
index 453633a74c171a..f2096a4caf5440 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread04.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread04_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread05.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread05.cs
index dc8110c911143f..f6ecc934dc1637 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread05.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread05.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread05_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread05.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread05_WaitCallback.csproj
index c5fee6a26f374a..a05d0f9a722627 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread05.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread05_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread06.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread06.cs
index 1d21f8f7b10429..71936de8e5e625 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread06.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread06.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread06_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread06.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread06_WaitCallback.csproj
index 10eb2b26b956f0..cb053f555a4522 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread06.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread06_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread07.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread07.cs
index c26b2ab14f4ffa..0ace693307a50a 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread07.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread07.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread07_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread07.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread07_WaitCallback.csproj
index 450d6df55dcc3f..1f50accfe0ea18 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread07.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread07_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread08.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread08.cs
index d649bce0b14d8c..76cd0910a265c7 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread08.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread08.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread08_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread08.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread08_WaitCallback.csproj
index 5f82b863555899..1d1b003dbaa67e 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread08.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread08_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread09.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread09.cs
index 07a8a9c5ad2e81..5e414e16a71a42 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread09.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread09.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread09_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread09.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread09_WaitCallback.csproj
index 15757e66ca2647..bb56217eeec1dd 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread09.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread09_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread10.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread10.cs
index 3a42ad0d1f8b43..6924798b9677f9 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread10.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -63,7 +64,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread10.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread10_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread10.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread10_WaitCallback.csproj
index 50c9f8b577af16..7beeeef8f8b5d0 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread10.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread10_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread11.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread11.cs
index 5e4e7d52a91c0f..96b0a04f2a0708 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread11.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -63,7 +64,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread11.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread11_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread11.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread11_WaitCallback.csproj
index ba2c41a9bf60bb..8e0e7d51593ba8 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread11.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread11_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread12.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread12.cs
index 51dfec07b00c27..e9a3d7d65bb612 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread12.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -63,7 +64,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread12.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread12_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread12.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread12_WaitCallback.csproj
index 34ad355611a30d..49cd594843a3dc 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread12.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread12_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread13.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread13.cs
index a639d0ad5a634a..d0d9c80d3e8ac4 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread13.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -210,7 +211,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread13.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread13_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread13.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread13_WaitCallback.csproj
index 9733eb9173eb42..de3ea8b6624782 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread13.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread13_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread14.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread14.cs
index 0ac4660e8fbdee..7ed7d375621bdf 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread14.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -210,7 +211,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread14.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread14_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread14.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread14_WaitCallback.csproj
index 64f08c0b44d426..f2f3aef1b36732 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread14.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread14_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread15.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread15.cs
index 8ba040b6da1b2f..c2f26ac416be3d 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread15.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread15.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -210,7 +211,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread15.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread15_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread15.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread15_WaitCallback.csproj
index 046dddf9fa55f6..8e4fd42c9c1fbb 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread15.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread15_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread16.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread16.cs
index d10f8a44d6d6cd..0ea0d254c414e1 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread16.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread16.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread16.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread16_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread16.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread16_WaitCallback.csproj
index 3153426f406209..b5f0f4927bd2da 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread16.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread16_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread17.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread17.cs
index 754c9ff13ea4aa..78be9436220d42 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread17.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread17.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread17.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread17_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread17.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread17_WaitCallback.csproj
index e96370c26a6256..04d2777ffb7cf3 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread17.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread17_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread18.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread18.cs
index 882579bd944ee0..19d66063c7d993 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread18.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread18.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread18.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread18_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread18.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread18_WaitCallback.csproj
index bf32e098685567..b4ccb87122f70d 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread18.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread18_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread19.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread19.cs
index 42feab56adc5a0..a7f9c16069fdb1 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread19.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread19.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread19.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread19_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread19.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread19_WaitCallback.csproj
index bfd9fc34c62174..d7de30cfe127c3 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread19.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread19_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread20.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread20.cs
index 96d530186ce38b..e4c7d2d0a13ddf 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread20.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread20.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread20.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread20_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread20.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread20_WaitCallback.csproj
index 78af0fab8811ce..d804dc9b48454d 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread20.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread20_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread21.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread21.cs
index fb3e4d9f51b58e..e5d5bfdb8c9d37 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread21.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread21.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread21.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread21_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread21.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread21_WaitCallback.csproj
index a82f9e176a457d..69773fa6f02250 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread21.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread21_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread22.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread22.cs
index b0e0dd8f73bf2d..57be95352f74c7 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread22.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread22.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -220,7 +221,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread22.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread22_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread22.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread22_WaitCallback.csproj
index 0fa4c6c2bd2f71..a050afe11f830e 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread22.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread22_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread23.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread23.cs
index 1420d50c0fa38b..f2b26a0f7d06b3 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread23.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread23.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -218,7 +219,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread23.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread23_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread23.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread23_WaitCallback.csproj
index 959010726defa2..2e859a958875ea 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread23.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread23_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread24.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread24.cs
index 9c73e17978e285..1bd7d9f6380997 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread24.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread24.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -216,7 +217,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread24.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread24_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread24.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread24_WaitCallback.csproj
index 16e4591936d94a..382efde9c1a864 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread24.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread24_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread25.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread25.cs
index f1de1913a9daf5..53e9aef61ab6ce 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread25.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread25.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread25.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread25_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread25.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread25_WaitCallback.csproj
index 3d8dcb8d4e1649..20ef63e37fb615 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread25.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread25_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread26.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread26.cs
index 744fea964bfdf8..b383e63a3bacfc 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread26.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread26.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread26.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread26_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread26.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread26_WaitCallback.csproj
index 044a653ba09d8f..05e934b6702bc9 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread26.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread26_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread27.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread27.cs
index de80e4b823f36e..5d716ebf176aae 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread27.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread27.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread27.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread27_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread27.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread27_WaitCallback.csproj
index fa0d5d43ff3516..7fcfdd560ff756 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread27.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread27_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread28.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread28.cs
index 52d0712f756448..3850bec802ad5d 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread28.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread28.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread28.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread28_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread28.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread28_WaitCallback.csproj
index 92d827a4ee2a2f..38ccf9fb4ab21e 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread28.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread28_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread29.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread29.cs
index 4b1dccc772b266..c60e3b509d5b8f 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread29.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread29.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread29.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread29_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread29.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread29_WaitCallback.csproj
index 03cd03474ed7f1..f20026fba40834 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread29.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread29_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread30.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread30.cs
index 9ec8d7ef9f4ef4..a3663bdb7cb6c4 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread30.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread30.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread30.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread30_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread30.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread30_WaitCallback.csproj
index 4f36d7325676fe..5c20d5b6e4e9c6 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread30.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread30_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread01.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread01_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread01.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread01_syncdelegate.csproj
index e4f858a0396ea8..10b6b39f924b16 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread01.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread01_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread02.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread02_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread02.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread02_syncdelegate.csproj
index 430250b3746792..23f16bffe07305 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread02.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread02_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread03.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread03_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread03.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread03_syncdelegate.csproj
index d98eb265922c56..b187d3788ccb76 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread03.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread03_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread04.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread04_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread04.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread04_syncdelegate.csproj
index 453633a74c171a..f2096a4caf5440 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread04.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread04_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread05.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread05_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread05.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread05_syncdelegate.csproj
index c5fee6a26f374a..a05d0f9a722627 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread05.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread05_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread06.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread06_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread06.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread06_syncdelegate.csproj
index 10eb2b26b956f0..cb053f555a4522 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread06.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread06_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread07.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread07_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread07.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread07_syncdelegate.csproj
index 450d6df55dcc3f..1f50accfe0ea18 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread07.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread07_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread08.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread08_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread08.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread08_syncdelegate.csproj
index 5f82b863555899..1d1b003dbaa67e 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread08.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread08_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread09.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread09_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread09.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread09_syncdelegate.csproj
index 15757e66ca2647..bb56217eeec1dd 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread09.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread09_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread10.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread10_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread10.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread10_syncdelegate.csproj
index 50c9f8b577af16..7beeeef8f8b5d0 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread10.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread10_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread11.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread11_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread11.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread11_syncdelegate.csproj
index ba2c41a9bf60bb..8e0e7d51593ba8 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread11.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread11_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread12.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread12_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread12.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread12_syncdelegate.csproj
index 34ad355611a30d..49cd594843a3dc 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread12.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread12_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread13.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread13_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread13.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread13_syncdelegate.csproj
index 9733eb9173eb42..de3ea8b6624782 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread13.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread13_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread14.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread14_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread14.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread14_syncdelegate.csproj
index 64f08c0b44d426..f2f3aef1b36732 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread14.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread14_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread15.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread15_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread15.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread15_syncdelegate.csproj
index 046dddf9fa55f6..8e4fd42c9c1fbb 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread15.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread15_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread16.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread16_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread16.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread16_syncdelegate.csproj
index 3153426f406209..b5f0f4927bd2da 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread16.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread16_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread17.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread17_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread17.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread17_syncdelegate.csproj
index e96370c26a6256..04d2777ffb7cf3 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread17.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread17_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread18.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread18_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread18.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread18_syncdelegate.csproj
index bf32e098685567..b4ccb87122f70d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread18.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread18_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread19.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread19_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread19.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread19_syncdelegate.csproj
index bfd9fc34c62174..d7de30cfe127c3 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread19.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread19_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread20.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread20_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread20.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread20_syncdelegate.csproj
index 78af0fab8811ce..d804dc9b48454d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread20.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread20_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread21.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread21_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread21.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread21_syncdelegate.csproj
index a82f9e176a457d..69773fa6f02250 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread21.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread21_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread22.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread22_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread22.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread22_syncdelegate.csproj
index 0fa4c6c2bd2f71..a050afe11f830e 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread22.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread22_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread23.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread23_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread23.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread23_syncdelegate.csproj
index 959010726defa2..2e859a958875ea 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread23.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread23_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread24.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread24_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread24.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread24_syncdelegate.csproj
index 16e4591936d94a..382efde9c1a864 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread24.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread24_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread25.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread25_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread25.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread25_syncdelegate.csproj
index 3d8dcb8d4e1649..20ef63e37fb615 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread25.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread25_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread26.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread26_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread26.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread26_syncdelegate.csproj
index 044a653ba09d8f..05e934b6702bc9 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread26.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread26_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread27.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread27_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread27.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread27_syncdelegate.csproj
index fa0d5d43ff3516..7fcfdd560ff756 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread27.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread27_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread28.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread28_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread28.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread28_syncdelegate.csproj
index 92d827a4ee2a2f..38ccf9fb4ab21e 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread28.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread28_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread29.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread29_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread29.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread29_syncdelegate.csproj
index 03cd03474ed7f1..f20026fba40834 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread29.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread29_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread30.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread30_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread30.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread30_syncdelegate.csproj
index 4f36d7325676fe..5c20d5b6e4e9c6 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread30.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread30_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread01.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread01.cs
index 371c8ef412cf52..179bcef3379f93 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread01.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -35,7 +36,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread02.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread02.cs
index 39951b6ecfa5b7..2cc5e78cc88103 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread02.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -35,7 +36,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread03.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread03.cs
index 5775c0715f0cb0..eca17b5aa6b48e 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread03.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -37,7 +38,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread04.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread04.cs
index 806ed643d699f8..8337a6f50e61a2 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread04.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread05.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread05.cs
index 8bd7cc02c3a1ae..c8fba0f9170260 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread05.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread06.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread06.cs
index be2ae5a96fe9a8..8879ce3d3fc5b9 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread06.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread07.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread07.cs
index 251ef78496a753..d429ffa258f233 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread07.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -37,7 +38,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread08.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread08.cs
index 150a1c7528682e..e4e17e3b44b065 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread08.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread09.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread09.cs
index 6a1751bb59e04a..074a8ef3788602 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread09.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread10.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread10.cs
index ad4c25ca6f0900..d4f8da650cc61f 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread10.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread11.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread11.cs
index 114e96737bc266..70934a62a754a6 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread11.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread12.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread12.cs
index 276abe66827497..01cf35b252675e 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread12.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread13.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread13.cs
index 0d60ace568ec06..130198adcbaa6c 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread13.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -130,7 +131,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread14.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread14.cs
index 5f40616ec3632d..8d49266d1d8011 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread14.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -130,7 +131,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread15.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread15.cs
index cd499e9cd2a3ff..ee644d4abac6d8 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread15.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread15.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -130,7 +131,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread16.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread16.cs
index 32868ba223f929..4ee8a37e6548d0 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread16.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread16.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -45,7 +46,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread17.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread17.cs
index 1d1227d76efe28..56c390666fe760 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread17.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread17.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -45,7 +46,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread18.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread18.cs
index 260474373ced5f..535ea9d6d63316 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread18.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread18.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -45,7 +46,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread19.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread19.cs
index 3e4d05c750786e..1fcdef53694595 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread19.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread19.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread20.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread20.cs
index bf19e7244f06af..f6187ca1ff3d2d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread20.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread20.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread21.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread21.cs
index c92947ef569ed5..1a7317db4c464b 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread21.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread21.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread22.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread22.cs
index 08923b21e44282..fd0adf23587055 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread22.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread22.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -142,7 +143,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest<int>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread23.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread23.cs
index 40bfd136358618..c0227954caa997 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread23.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread23.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -142,7 +143,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest<int>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread24.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread24.cs
index e58d0f74afc3a8..bb8f330973bca6 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread24.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread24.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -142,7 +143,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest<int>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread25.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread25.cs
index 542b9dde16060a..ae007e191728ed 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread25.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread25.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -37,7 +38,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread26.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread26.cs
index e2b1427084905a..ba16b636a794b0 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread26.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread26.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -37,7 +38,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread27.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread27.cs
index 832186b0dc3c02..378127f66eafbf 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread27.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread27.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -40,7 +41,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread28.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread28.cs
index 7b4b987c5b4050..98424a71d663db 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread28.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread28.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -40,7 +41,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread29.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread29.cs
index acee10d089f5a2..7094afb1fd78d1 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread29.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread29.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread30.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread30.cs
index 6bcc91dad3fbe6..471be154dc3a7f 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread30.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread30.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread01.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread01_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread01.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread01_threadstart.csproj
index e4f858a0396ea8..10b6b39f924b16 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread01.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread01_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread02.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread02_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread02.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread02_threadstart.csproj
index 430250b3746792..23f16bffe07305 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread02.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread02_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread03.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread03_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread03.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread03_threadstart.csproj
index d98eb265922c56..b187d3788ccb76 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread03.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread03_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread04.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread04_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread04.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread04_threadstart.csproj
index 453633a74c171a..f2096a4caf5440 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread04.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread04_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread05.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread05_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread05.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread05_threadstart.csproj
index c5fee6a26f374a..a05d0f9a722627 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread05.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread05_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread06.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread06_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread06.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread06_threadstart.csproj
index 10eb2b26b956f0..cb053f555a4522 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread06.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread06_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread07.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread07_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread07.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread07_threadstart.csproj
index 450d6df55dcc3f..1f50accfe0ea18 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread07.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread07_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread08.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread08_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread08.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread08_threadstart.csproj
index 5f82b863555899..1d1b003dbaa67e 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread08.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread08_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread09.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread09_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread09.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread09_threadstart.csproj
index 15757e66ca2647..bb56217eeec1dd 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread09.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread09_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread10.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread10_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread10.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread10_threadstart.csproj
index 50c9f8b577af16..7beeeef8f8b5d0 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread10.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread10_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread11.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread11_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread11.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread11_threadstart.csproj
index ba2c41a9bf60bb..8e0e7d51593ba8 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread11.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread11_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread12.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread12_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread12.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread12_threadstart.csproj
index 34ad355611a30d..49cd594843a3dc 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread12.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread12_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread13.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread13_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread13.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread13_threadstart.csproj
index 9733eb9173eb42..de3ea8b6624782 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread13.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread13_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread14.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread14_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread14.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread14_threadstart.csproj
index 64f08c0b44d426..f2f3aef1b36732 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread14.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread14_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread15.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread15_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread15.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread15_threadstart.csproj
index 046dddf9fa55f6..8e4fd42c9c1fbb 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread15.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread15_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread16.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread16_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread16.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread16_threadstart.csproj
index 3153426f406209..b5f0f4927bd2da 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread16.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread16_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread17.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread17_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread17.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread17_threadstart.csproj
index e96370c26a6256..04d2777ffb7cf3 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread17.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread17_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread18.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread18_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread18.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread18_threadstart.csproj
index bf32e098685567..b4ccb87122f70d 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread18.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread18_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread19.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread19_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread19.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread19_threadstart.csproj
index bfd9fc34c62174..d7de30cfe127c3 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread19.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread19_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread20.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread20_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread20.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread20_threadstart.csproj
index 78af0fab8811ce..d804dc9b48454d 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread20.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread20_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread21.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread21_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread21.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread21_threadstart.csproj
index a82f9e176a457d..69773fa6f02250 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread21.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread21_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread22.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread22_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread22.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread22_threadstart.csproj
index 0fa4c6c2bd2f71..a050afe11f830e 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread22.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread22_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread23.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread23_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread23.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread23_threadstart.csproj
index 959010726defa2..2e859a958875ea 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread23.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread23_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread24.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread24_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread24.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread24_threadstart.csproj
index 16e4591936d94a..382efde9c1a864 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread24.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread24_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread25.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread25_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread25.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread25_threadstart.csproj
index 3d8dcb8d4e1649..20ef63e37fb615 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread25.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread25_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread26.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread26_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread26.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread26_threadstart.csproj
index 044a653ba09d8f..05e934b6702bc9 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread26.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread26_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread27.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread27_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread27.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread27_threadstart.csproj
index fa0d5d43ff3516..7fcfdd560ff756 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread27.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread27_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread28.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread28_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread28.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread28_threadstart.csproj
index 92d827a4ee2a2f..38ccf9fb4ab21e 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread28.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread28_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread29.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread29_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread29.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread29_threadstart.csproj
index 03cd03474ed7f1..f20026fba40834 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread29.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread29_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread30.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread30_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread30.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread30_threadstart.csproj
index 4f36d7325676fe..5c20d5b6e4e9c6 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread30.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread30_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread01.cs b/src/tests/baseservices/threading/generics/threadstart/thread01.cs
index 4d7a86767c4f67..cbf1b63861c584 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread01.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -47,7 +48,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread02.cs b/src/tests/baseservices/threading/generics/threadstart/thread02.cs
index 488f7368d8ea28..201c7a844d7225 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread02.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -47,7 +48,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread03.cs b/src/tests/baseservices/threading/generics/threadstart/thread03.cs
index f9b10384047c5d..c29cd4913b9577 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread03.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread04.cs b/src/tests/baseservices/threading/generics/threadstart/thread04.cs
index 4c710dc36660e9..e05e3a50e56ce2 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread04.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread05.cs b/src/tests/baseservices/threading/generics/threadstart/thread05.cs
index 57a28207de5d3e..9e93990325840f 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread05.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread06.cs b/src/tests/baseservices/threading/generics/threadstart/thread06.cs
index b2e593c909dc7b..38cba89ec8da40 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread06.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread07.cs b/src/tests/baseservices/threading/generics/threadstart/thread07.cs
index 9097b6cdb43923..c1c6421789bac8 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread07.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -47,7 +48,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread08.cs b/src/tests/baseservices/threading/generics/threadstart/thread08.cs
index 232b1baf36b49d..36ca9fbed712ac 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread08.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread09.cs b/src/tests/baseservices/threading/generics/threadstart/thread09.cs
index 9b71df600caa9f..b1f9e3c067cc97 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread09.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread10.cs b/src/tests/baseservices/threading/generics/threadstart/thread10.cs
index c101ad956a6ac0..ef87b8174076e7 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread10.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -57,7 +58,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread11.cs b/src/tests/baseservices/threading/generics/threadstart/thread11.cs
index 5200ea558b370a..4fb3d55c4113c7 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread11.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -57,7 +58,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread12.cs b/src/tests/baseservices/threading/generics/threadstart/thread12.cs
index 5d5865c4781dd9..ea88a36dcfdf4d 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread12.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -57,7 +58,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread13.cs b/src/tests/baseservices/threading/generics/threadstart/thread13.cs
index dd7c2c4ef89f6e..e53d18a9b5e368 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread13.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -175,7 +176,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread14.cs b/src/tests/baseservices/threading/generics/threadstart/thread14.cs
index cb3259a8f3f869..e015e5e2ee33c8 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread14.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -175,7 +176,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread15.cs b/src/tests/baseservices/threading/generics/threadstart/thread15.cs
index f68339268c3780..456bb7f00e2655 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread15.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread15.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -175,7 +176,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread16.cs b/src/tests/baseservices/threading/generics/threadstart/thread16.cs
index 8e6f93f8cd62e4..bfcb94203f4c6a 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread16.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread16.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -54,7 +55,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread17.cs b/src/tests/baseservices/threading/generics/threadstart/thread17.cs
index 42bf6b66f5e112..493cc2b5b55399 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread17.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread17.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -54,7 +55,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread18.cs b/src/tests/baseservices/threading/generics/threadstart/thread18.cs
index d92ac920d30b0b..149b4617556420 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread18.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread18.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -54,7 +55,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread19.cs b/src/tests/baseservices/threading/generics/threadstart/thread19.cs
index 131ff18af97c9c..5922497f2e3d33 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread19.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread19.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -58,7 +59,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread20.cs b/src/tests/baseservices/threading/generics/threadstart/thread20.cs
index a461eaf1b2d76d..9936a3c10138fc 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread20.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread20.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -58,7 +59,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread21.cs b/src/tests/baseservices/threading/generics/threadstart/thread21.cs
index 2ced39d89990dd..a6f4b97acec957 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread21.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread21.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -58,7 +59,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread22.cs b/src/tests/baseservices/threading/generics/threadstart/thread22.cs
index c66066d745ee9d..00b4ecd918f3fe 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread22.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread22.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -187,7 +188,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread23.cs b/src/tests/baseservices/threading/generics/threadstart/thread23.cs
index 173f8426d825f3..f880ed4876395f 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread23.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread23.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -187,7 +188,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread24.cs b/src/tests/baseservices/threading/generics/threadstart/thread24.cs
index e5c9f615ef5e7c..a14d243fa2fb14 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread24.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread24.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -187,7 +188,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread25.cs b/src/tests/baseservices/threading/generics/threadstart/thread25.cs
index 96c1843f47f6ba..d180917e9df84d 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread25.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread25.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -46,7 +47,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread26.cs b/src/tests/baseservices/threading/generics/threadstart/thread26.cs
index 268fe6b3323965..5b41ecd9f28cae 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread26.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread26.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -46,7 +47,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread27.cs b/src/tests/baseservices/threading/generics/threadstart/thread27.cs
index be320cdc0ea63f..c294a1174abe76 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread27.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread27.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread28.cs b/src/tests/baseservices/threading/generics/threadstart/thread28.cs
index 3e06325d4b0327..bcffc2ed9b3017 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread28.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread28.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread29.cs b/src/tests/baseservices/threading/generics/threadstart/thread29.cs
index 784c989c01bf22..6c367cea276b84 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread29.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread29.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread30.cs b/src/tests/baseservices/threading/generics/threadstart/thread30.cs
index 65a1c07b3955de..c4380a990a9ab3 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread30.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread30.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen
 {
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-a.cs b/src/tests/baseservices/threading/regressions/13662/13662-a.cs
index 5cd7b9f4a4015b..c6a93c6228dab2 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-a.cs
+++ b/src/tests/baseservices/threading/regressions/13662/13662-a.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Test_13662_a {
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 
 		int rValue = 100;
 		Timer[] tArray = new Timer[1000];
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-a.csproj b/src/tests/baseservices/threading/regressions/13662/13662-a.csproj
index bef07383c37bb9..4c1fe3255567a7 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-a.csproj
+++ b/src/tests/baseservices/threading/regressions/13662/13662-a.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Under heavy load, some of the TimerCallback functions don't complete before the test exits, preventing unload -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-b.cs b/src/tests/baseservices/threading/regressions/13662/13662-b.cs
index 4cbb993337dfb0..9f0ced28afff08 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-b.cs
+++ b/src/tests/baseservices/threading/regressions/13662/13662-b.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Test_13662_b {
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 
 		int rValue = 100;
 		Timer[] tArray = new Timer[1000];
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-b.csproj b/src/tests/baseservices/threading/regressions/13662/13662-b.csproj
index b96e49100c3702..ec5587a234600c 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-b.csproj
+++ b/src/tests/baseservices/threading/regressions/13662/13662-b.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Under heavy load, some of the TimerCallback functions don't complete before the test exits, preventing unload -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-simple.csproj b/src/tests/baseservices/threading/regressions/13662/13662-simple.csproj
index e172ab23541759..9cbd4492e55fac 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-simple.csproj
+++ b/src/tests/baseservices/threading/regressions/13662/13662-simple.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Under heavy load, some of the TimerCallback functions don't complete before the test exits, preventing unload -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/baseservices/threading/regressions/13662/simple.cs b/src/tests/baseservices/threading/regressions/13662/simple.cs
index 5b342eacb9c2e4..463c8efca31ee8 100644
--- a/src/tests/baseservices/threading/regressions/13662/simple.cs
+++ b/src/tests/baseservices/threading/regressions/13662/simple.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Test_simple {
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 
 		int rValue = 100;
 		Timer[] tArray = new Timer[100];
diff --git a/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.cs b/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.cs
index 3e1670dae7a6a3..2352f20451c0db 100644
--- a/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.cs
+++ b/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.cs
@@ -5,6 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Threading;
+using Xunit;
 
 /*
  * Issue description:
@@ -14,7 +15,8 @@
 
 public class Test_foreground_shutdown
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         new Thread(() =>
         {
diff --git a/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.csproj b/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.csproj
index b217844f3a72a9..6adb4a421c1051 100644
--- a/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.csproj
+++ b/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for Environment.Exit -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/regressions/269336/objmonhelper.cs b/src/tests/baseservices/threading/regressions/269336/objmonhelper.cs
index 51989aea4cf6b0..ed5f97e99d913c 100644
--- a/src/tests/baseservices/threading/regressions/269336/objmonhelper.cs
+++ b/src/tests/baseservices/threading/regressions/269336/objmonhelper.cs
@@ -3,12 +3,14 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-class ObjMonHelper {
+public class ObjMonHelper {
 	const string FailMsg = @"Monitor.Enter appears to have mistaken a hash code in an object header for
 a valid lock owned by the current thread.";
 
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		var ok = true;
 		var arr = new object[1024*1024];
 
diff --git a/src/tests/baseservices/threading/regressions/269336/objmonhelper.csproj b/src/tests/baseservices/threading/regressions/269336/objmonhelper.csproj
index 9f562d8b3b40f8..304a8006fa1e84 100644
--- a/src/tests/baseservices/threading/regressions/269336/objmonhelper.csproj
+++ b/src/tests/baseservices/threading/regressions/269336/objmonhelper.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible, CLRTestEnvironmentVariable -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/regressions/30032/30032.cs b/src/tests/baseservices/threading/regressions/30032/30032.cs
index 8c72b4a1472c79..ebd4c8504898f4 100644
--- a/src/tests/baseservices/threading/regressions/30032/30032.cs
+++ b/src/tests/baseservices/threading/regressions/30032/30032.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Test_30032 {
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 
 		int rValue = 100;
 		Timer[] tArray = new Timer[100];
diff --git a/src/tests/baseservices/threading/regressions/30032/30032.csproj b/src/tests/baseservices/threading/regressions/30032/30032.csproj
index 20447c6494d3a9..1e74cf137db137 100644
--- a/src/tests/baseservices/threading/regressions/30032/30032.csproj
+++ b/src/tests/baseservices/threading/regressions/30032/30032.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/regressions/576463/576463.cs b/src/tests/baseservices/threading/regressions/576463/576463.cs
index 2bcb36a38a2a6f..bbf8222020d3c4 100644
--- a/src/tests/baseservices/threading/regressions/576463/576463.cs
+++ b/src/tests/baseservices/threading/regressions/576463/576463.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
-
-class Test
+using System.Runtime.CompilerServices;
+using Xunit;
+public class Test
 {
     bool _aRun = false;
     public void A()
@@ -107,7 +108,11 @@ public static void ReadArgs(string[] args)
     static bool s_takeLock = false;
     static bool s_contention = false;
 
-    public static int Main(string[] args)
+    [Fact]
+    public static int TestEntryPoint() => Run(new string[0]);
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static int Run(string[] args)
     {
         ReadArgs(args);
 
diff --git a/src/tests/baseservices/threading/regressions/576463/576463.csproj b/src/tests/baseservices/threading/regressions/576463/576463.csproj
index 239163dce0a65d..af9931808c36e9 100644
--- a/src/tests/baseservices/threading/regressions/576463/576463.csproj
+++ b/src/tests/baseservices/threading/regressions/576463/576463.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/tests/baseservices/threading/regressions/6906/6906.csproj b/src/tests/baseservices/threading/regressions/6906/6906.csproj
index 469daadd67493c..62e4cddc319456 100644
--- a/src/tests/baseservices/threading/regressions/6906/6906.csproj
+++ b/src/tests/baseservices/threading/regressions/6906/6906.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/regressions/6906/repro.cs b/src/tests/baseservices/threading/regressions/6906/repro.cs
index b077fba90e1cde..f740bd05f0e982 100644
--- a/src/tests/baseservices/threading/regressions/6906/repro.cs
+++ b/src/tests/baseservices/threading/regressions/6906/repro.cs
@@ -2,11 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Beta 
 {
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
     		int rValue = 100;
 		Console.WriteLine("Setup an Infinite Wait with negative value other than -1");
diff --git a/src/tests/baseservices/threading/regressions/beta1/347011.cs b/src/tests/baseservices/threading/regressions/beta1/347011.cs
index 74bb5b6106886a..165a13fd99a2d5 100644
--- a/src/tests/baseservices/threading/regressions/beta1/347011.cs
+++ b/src/tests/baseservices/threading/regressions/beta1/347011.cs
@@ -3,12 +3,14 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class TimerTest
 {
     public static void Target(Object foo){}
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int retVal = 0;
         Timer timer = new Timer(new TimerCallback(Target),new Object(), 1000,1000);
diff --git a/src/tests/baseservices/threading/regressions/beta1/347011.csproj b/src/tests/baseservices/threading/regressions/beta1/347011.csproj
index c351bcc1ad95e4..bc9be0089b69dd 100644
--- a/src/tests/baseservices/threading/regressions/beta1/347011.csproj
+++ b/src/tests/baseservices/threading/regressions/beta1/347011.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/regressions/beta2/437017.cs b/src/tests/baseservices/threading/regressions/beta2/437017.cs
index c279bff2179925..09c7ffd90a54d8 100644
--- a/src/tests/baseservices/threading/regressions/beta2/437017.cs
+++ b/src/tests/baseservices/threading/regressions/beta2/437017.cs
@@ -3,15 +3,17 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-class Test
+public class Test
 {    
     static bool _fTestFailed = false;
     static bool _fTestDone = false;
     static ManualResetEvent _mre;
     static AutoResetEvent _are = new AutoResetEvent(false);
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Thread th = new Thread(new ThreadStart(Thread2));
         th.Start();
diff --git a/src/tests/baseservices/threading/regressions/beta2/437017.csproj b/src/tests/baseservices/threading/regressions/beta2/437017.csproj
index 716b572402f55a..493f8de370cc9f 100644
--- a/src/tests/baseservices/threading/regressions/beta2/437017.csproj
+++ b/src/tests/baseservices/threading/regressions/beta2/437017.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- This test leaves random number of WaitOrTimerCallbacks registered at the exit, which prevents unloading -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/baseservices/threading/regressions/beta2/437044.cs b/src/tests/baseservices/threading/regressions/beta2/437044.cs
index 98abd96294ee26..daaaac7874e8c4 100644
--- a/src/tests/baseservices/threading/regressions/beta2/437044.cs
+++ b/src/tests/baseservices/threading/regressions/beta2/437044.cs
@@ -3,15 +3,17 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-class Test
+public class Test
 {    
     static bool _fTestFailed = false;
     static bool _fTestDone = false;
     static ManualResetEvent _mre;
     static AutoResetEvent _are = new AutoResetEvent(false);
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Thread th = new Thread(new ThreadStart(Thread2));
         th.Start();
diff --git a/src/tests/baseservices/threading/regressions/beta2/437044.csproj b/src/tests/baseservices/threading/regressions/beta2/437044.csproj
index 8c1c050c7d0902..11e4aec55051ec 100644
--- a/src/tests/baseservices/threading/regressions/beta2/437044.csproj
+++ b/src/tests/baseservices/threading/regressions/beta2/437044.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- This test isn't technically incompatible with GCStress, but it ends up running very slowly
          in some configurations, e.g. GCStress=3 on Linux/arm32 measured at 20 minutes.
diff --git a/src/tests/baseservices/threading/regressions/devdiv489437/test489437.cs b/src/tests/baseservices/threading/regressions/devdiv489437/test489437.cs
index 7f9b83d0abea26..3434de6615eaf7 100644
--- a/src/tests/baseservices/threading/regressions/devdiv489437/test489437.cs
+++ b/src/tests/baseservices/threading/regressions/devdiv489437/test489437.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Xunit;
 
 /*
  * Issue description:
@@ -19,9 +20,10 @@ release the erroneously-acquired count.
   cancel the associated Task.
 */
 
-class Test
+public class Test
 {
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         SemaphoreSlim s = new SemaphoreSlim(initialCount: 1);
 
diff --git a/src/tests/baseservices/threading/regressions/devdiv489437/test489437.csproj b/src/tests/baseservices/threading/regressions/devdiv489437/test489437.csproj
index dda86d35df4a0e..7500ecabf35fd0 100644
--- a/src/tests/baseservices/threading/regressions/devdiv489437/test489437.csproj
+++ b/src/tests/baseservices/threading/regressions/devdiv489437/test489437.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/regressions/whidbey_m3/200176.cs b/src/tests/baseservices/threading/regressions/whidbey_m3/200176.cs
index 0ee848ee0dd4cb..44030bf7a8d847 100644
--- a/src/tests/baseservices/threading/regressions/whidbey_m3/200176.cs
+++ b/src/tests/baseservices/threading/regressions/whidbey_m3/200176.cs
@@ -3,10 +3,12 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class Stop {
 
-    public static int Main() {              
+    [Fact]
+    public static int TestEntryPoint() {              
 
         Stop tm = new Stop();
 	try
diff --git a/src/tests/baseservices/threading/regressions/whidbey_m3/200176.csproj b/src/tests/baseservices/threading/regressions/whidbey_m3/200176.csproj
index 6ee702a0f5b0ac..02279f3109bc03 100644
--- a/src/tests/baseservices/threading/regressions/whidbey_m3/200176.csproj
+++ b/src/tests/baseservices/threading/regressions/whidbey_m3/200176.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threading_group1.csproj b/src/tests/baseservices/threading/threading_group1.csproj
new file mode 100644
index 00000000000000..a099f2d9e87c57
--- /dev/null
+++ b/src/tests/baseservices/threading/threading_group1.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <MergedWrapperProjectReference Include="commitstackonlyasneeded/**/*.??proj" />
+    <MergedWrapperProjectReference Include="coverage/**/*.??proj" />
+    <MergedWrapperProjectReference Include="DeadThreads/**/*.??proj" />
+    <MergedWrapperProjectReference Include="delegate/**/*.??proj" />
+    <MergedWrapperProjectReference Include="generics/threadstart/*.??proj" />
+    <MergedWrapperProjectReference Include="generics/syncdelegate/*.??proj" />
+    <MergedWrapperProjectReference Include="regressions/**/*.??proj" />
+    <MergedWrapperProjectReference Update="**" Aliases="$([System.String]::Concat(&quot;_&quot;,$([System.String]::Copy(&quot;%(Filename)&quot;).Replace(&quot;-&quot;,&quot;_&quot;))))" />
+    <ProjectReference Include="@(MergedWrapperProjectReference)" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tests/baseservices/threading/threading_group2.csproj b/src/tests/baseservices/threading/threading_group2.csproj
new file mode 100644
index 00000000000000..bb5468800359d7
--- /dev/null
+++ b/src/tests/baseservices/threading/threading_group2.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <MergedWrapperProjectReference Include="*/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="commitstackonlyasneeded/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="coverage/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="DeadThreads/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="delegate/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="generics/syncdelegate/*.??proj" />
+    <MergedWrapperProjectReference Remove="generics/threadstart/*.??proj" />
+    <MergedWrapperProjectReference Remove="regressions/**/*.??proj" />
+    <MergedWrapperProjectReference Update="**" Aliases="$([System.String]::Concat(&quot;_&quot;,$([System.String]::Copy(&quot;%(Filename)&quot;).Replace(&quot;-&quot;,&quot;_&quot;))))" />
+    <ProjectReference Include="@(MergedWrapperProjectReference)" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.cs
index 0f28d3a777952b..35b81d35a5bf6c 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandle1
+public class BindHandle1
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandle1().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
index f799530306736a..3eb68ccc39c5e1 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.cs
index 65866a6f2e978d..aabbaf75c43d47 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Threading;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
-class BindHandleInvalid
+public class BindHandleInvalid
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleInvalid().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
index e58a53f06c50d7..5e8bb1cb82da1e 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.cs
index 5015773e5da716..120ea64f89f4aa 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandleInvalid3
+public class BindHandleInvalid3
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleInvalid3().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
index 949f202963c5d9..766f7696668aba 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.cs
index 953efb598d9373..6aaede08cb4a3d 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandleInvalid3
+public class BindHandleInvalid3
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleInvalid3().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
index bd85b46f26a8cd..6229100279eb8b 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.cs
index b67a37f3729ccf..59d9ce96260fdd 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandleInvalid3
+public class BindHandleInvalid3
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleInvalid3().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
index 751974a825b0b3..f372f741ccaf9f 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.cs
index 49ce25514acdf5..5a8000d23b9e66 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandle1
+public class BindHandle1
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandle1().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
index 6f41f919b65acb..2aa066885f7f2b 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.cs
index 1d4c283ab34f50..8a050dff9c8b80 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.cs
@@ -3,10 +3,12 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-class BindHandleNull
+public class BindHandleNull
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleNull().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
index b76ee45c7d68b5..f47c695865c73f 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/unregister/regression_749068.cs b/src/tests/baseservices/threading/threadpool/unregister/regression_749068.cs
index eb5f7b6556f6b5..54f7060737e1c9 100644
--- a/src/tests/baseservices/threading/threadpool/unregister/regression_749068.cs
+++ b/src/tests/baseservices/threading/threadpool/unregister/regression_749068.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading;
+using Xunit;
 
 /************************
  * Regression test for bug Bug 749068:WatsonCrash: coreclr.dll!Thread::DoAppropriateWaitWorker -- APPLICATION_HANG_BlockedOn_EventHandle c0000194
@@ -88,9 +89,10 @@ public void unregister()
         }
     }
 
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Callback obj = new Callback();
 
diff --git a/src/tests/baseservices/threading/threadpool/unregister/regression_749068.csproj b/src/tests/baseservices/threading/threadpool/unregister/regression_749068.csproj
index f639a63d1e0232..b831c8534d4d6d 100644
--- a/src/tests/baseservices/threading/threadpool/unregister/regression_749068.csproj
+++ b/src/tests/baseservices/threading/threadpool/unregister/regression_749068.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic01.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic01.csproj
index 8d462f6f6182be..c9d90e5f0f9336 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic01.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic01.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic02.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic02.csproj
index e8f1bb73b14e7c..8a21ed855b1c50 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic02.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic02.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic03.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic03.csproj
index a47c73cca96864..f0609a0f334cd1 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic03.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic03.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic05.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic05.csproj
index df59233b089674..4ec77f7e97b58f 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic05.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic05.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic06.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic06.csproj
index f49099a7cc48ef..cab75580cc4f0b 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic06.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic06.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic01.cs b/src/tests/baseservices/threading/threadstatic/threadstatic01.cs
index f663c21c782a35..478fe4e2acba44 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic01.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic01.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class Value0
 {
@@ -767,7 +768,8 @@ public class Test_threadstatic01
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic01 staticsTest = new Test_threadstatic01();
         staticsTest.RunTest();
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic02.cs b/src/tests/baseservices/threading/threadstatic/threadstatic02.cs
index 184d58c002c7dc..dfe1f31ef98515 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic02.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic02.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class MyData
 {
@@ -46,7 +47,8 @@ public class Test_threadstatic02
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic02 staticsTest = new Test_threadstatic02();        
         staticsTest.RunTest();        
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic03.cs b/src/tests/baseservices/threading/threadstatic/threadstatic03.cs
index f6d31afa9c5d0e..4d49e4d38d8084 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic03.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic03.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class MyData
 {
@@ -41,7 +42,8 @@ public class Test_threadstatic03
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic03 staticsTest = new Test_threadstatic03();        
         staticsTest.RunTest();
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic05.cs b/src/tests/baseservices/threading/threadstatic/threadstatic05.cs
index 4d161f51e5a2d4..063b4c215e09e1 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic05.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic05.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class MyData
 {
@@ -41,7 +42,8 @@ public class Test_threadstatic05
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic05 staticsTest = new Test_threadstatic05();        
         staticsTest.RunTest();        
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic06.cs b/src/tests/baseservices/threading/threadstatic/threadstatic06.cs
index ecabcc6771bc12..1b86ab2b4c9698 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic06.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic06.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class MyData
 {
@@ -36,7 +37,8 @@ public class Test_threadstatic06
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic06 staticsTest = new Test_threadstatic06();        
         staticsTest.RunTest();
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic07.cs b/src/tests/baseservices/threading/threadstatic/threadstatic07.cs
index b366fa2f90a4c4..bbc741a213ed82 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic07.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic07.cs
@@ -5,6 +5,7 @@
 using System;
 using System.IO;
 using System.Threading;
+using Xunit;
 
 // Test Description:
 // Just basic heavy reading and writing from ThreadStatic members in normal threads and threadpools threads as well.
@@ -46,7 +47,8 @@ public class Sensor
 	[ThreadStatic]
 	static String SSS = "Olden Polynice";
 
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Console.WriteLine("Hello NBA Fans!!");
 		Console.WriteLine("ThreadStatic test 2: Various reading and writing of Threadstatic variables.");
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic07.csproj b/src/tests/baseservices/threading/threadstatic/threadstatic07.csproj
index 0414055aad7604..1e33078e28ec08 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic07.csproj
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic07.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic08.cs b/src/tests/baseservices/threading/threadstatic/threadstatic08.cs
index 6c5da659f15f55..074fa9b13633f1 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic08.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic08.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Threading;
+using Xunit;
 
 public struct Struct
 {
@@ -15,7 +16,8 @@ public class Program
     [ThreadStatic]
     private static Struct TSStruct;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if(TSStruct.a != 0 || TSStruct.b != 0)
             return 101;
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic08.csproj b/src/tests/baseservices/threading/threadstatic/threadstatic08.csproj
index 551495b9a6fda5..8af1838da9dedb 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic08.csproj
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic08.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="threadstatic08.cs" />
   </ItemGroup>