diff --git a/src/tests/JIT/SIMD/AbsGeneric.cs b/src/tests/JIT/SIMD/AbsGeneric.cs
index 660e21ea6c714..5cf5756471bd9 100644
--- a/src/tests/JIT/SIMD/AbsGeneric.cs
+++ b/src/tests/JIT/SIMD/AbsGeneric.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
         const float EPS = Single.Epsilon * 5;
 
@@ -20,7 +21,8 @@ static short[] GenerateArray(int size, short value)
             return arr;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             short[] arr = GenerateArray(60, 5);
             var a = new System.Numerics.Vector<short>(arr);
diff --git a/src/tests/JIT/SIMD/AbsGeneric_r.csproj b/src/tests/JIT/SIMD/AbsGeneric_r.csproj
index 5152f97f6b96c..cd74f799c1be7 100644
--- a/src/tests/JIT/SIMD/AbsGeneric_r.csproj
+++ b/src/tests/JIT/SIMD/AbsGeneric_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/AbsGeneric_ro.csproj b/src/tests/JIT/SIMD/AbsGeneric_ro.csproj
index bbab5a0e86455..db9878b841b54 100644
--- a/src/tests/JIT/SIMD/AbsGeneric_ro.csproj
+++ b/src/tests/JIT/SIMD/AbsGeneric_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/AbsSqrt.cs b/src/tests/JIT/SIMD/AbsSqrt.cs
index dbb22dc50bdb0..2d358e1a3bdcf 100644
--- a/src/tests/JIT/SIMD/AbsSqrt.cs
+++ b/src/tests/JIT/SIMD/AbsSqrt.cs
@@ -4,12 +4,14 @@
 using System.Collections.Generic;
 using System.Numerics;
 using Point = System.Numerics.Vector4;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point a = new Point(11, 13, 8, 4);
             Point b = new Point(11, 13, 2, 1);
diff --git a/src/tests/JIT/SIMD/AbsSqrt_r.csproj b/src/tests/JIT/SIMD/AbsSqrt_r.csproj
index 36da5a924d6df..4d452cafb5993 100644
--- a/src/tests/JIT/SIMD/AbsSqrt_r.csproj
+++ b/src/tests/JIT/SIMD/AbsSqrt_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/AbsSqrt_ro.csproj b/src/tests/JIT/SIMD/AbsSqrt_ro.csproj
index c3b6a2dac6858..5fd378d30ebc5 100644
--- a/src/tests/JIT/SIMD/AbsSqrt_ro.csproj
+++ b/src/tests/JIT/SIMD/AbsSqrt_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/AddingSequence.cs b/src/tests/JIT/SIMD/AddingSequence.cs
index fa09b0dbf56fb..81fe93946aa7a 100644
--- a/src/tests/JIT/SIMD/AddingSequence.cs
+++ b/src/tests/JIT/SIMD/AddingSequence.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector2;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
 		const float EPS = Single.Epsilon * 5;
 		
@@ -41,7 +42,8 @@ static int Adds()
             return 100;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point a = new Point(0, 0), b = new Point(1, 0);
             Point c = a + b;
diff --git a/src/tests/JIT/SIMD/AddingSequence_r.csproj b/src/tests/JIT/SIMD/AddingSequence_r.csproj
index 01f385f9a21dd..cb35a09e826c7 100644
--- a/src/tests/JIT/SIMD/AddingSequence_r.csproj
+++ b/src/tests/JIT/SIMD/AddingSequence_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/AddingSequence_ro.csproj b/src/tests/JIT/SIMD/AddingSequence_ro.csproj
index aab76d2b71c7f..fbae124491c96 100644
--- a/src/tests/JIT/SIMD/AddingSequence_ro.csproj
+++ b/src/tests/JIT/SIMD/AddingSequence_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/BitwiseOperations.cs b/src/tests/JIT/SIMD/BitwiseOperations.cs
index 7f90ae04d005c..9e68aa0992f1c 100644
--- a/src/tests/JIT/SIMD/BitwiseOperations.cs
+++ b/src/tests/JIT/SIMD/BitwiseOperations.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector2;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
         public const int DefaultSeed = 20010415;
         public static int Seed = Environment.GetEnvironmentVariable("CORECLR_SEED") switch
@@ -108,7 +109,8 @@ static int TestBool()
             return 100;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             if (TestDouble() != 100)
             {
diff --git a/src/tests/JIT/SIMD/BitwiseOperations_r.csproj b/src/tests/JIT/SIMD/BitwiseOperations_r.csproj
index 55828a9491717..1c4f03b912bca 100644
--- a/src/tests/JIT/SIMD/BitwiseOperations_r.csproj
+++ b/src/tests/JIT/SIMD/BitwiseOperations_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/BitwiseOperations_ro.csproj b/src/tests/JIT/SIMD/BitwiseOperations_ro.csproj
index 8ba3c5ef4e95a..9ced3884d445c 100644
--- a/src/tests/JIT/SIMD/BitwiseOperations_ro.csproj
+++ b/src/tests/JIT/SIMD/BitwiseOperations_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/BoxUnbox.cs b/src/tests/JIT/SIMD/BoxUnbox.cs
index 4cf6ea5bccc0a..9e487f3d5c2c1 100644
--- a/src/tests/JIT/SIMD/BoxUnbox.cs
+++ b/src/tests/JIT/SIMD/BoxUnbox.cs
@@ -3,12 +3,14 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             {
                 var a = new System.Numerics.Vector<int>(1);
diff --git a/src/tests/JIT/SIMD/BoxUnbox_r.csproj b/src/tests/JIT/SIMD/BoxUnbox_r.csproj
index 58c316f3f94d1..467340905af94 100644
--- a/src/tests/JIT/SIMD/BoxUnbox_r.csproj
+++ b/src/tests/JIT/SIMD/BoxUnbox_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/BoxUnbox_ro.csproj b/src/tests/JIT/SIMD/BoxUnbox_ro.csproj
index 6545ededd8408..b47035083ce78 100644
--- a/src/tests/JIT/SIMD/BoxUnbox_ro.csproj
+++ b/src/tests/JIT/SIMD/BoxUnbox_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/BugWithAVX.cs b/src/tests/JIT/SIMD/BugWithAVX.cs
index 7af46706cb3eb..686735761660a 100644
--- a/src/tests/JIT/SIMD/BugWithAVX.cs
+++ b/src/tests/JIT/SIMD/BugWithAVX.cs
@@ -2,12 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Numerics;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int Count = System.Numerics.Vector<int>.Count;
             return 100;
diff --git a/src/tests/JIT/SIMD/BugWithAVX_r.csproj b/src/tests/JIT/SIMD/BugWithAVX_r.csproj
index 5da6dffbf7554..04e8c81bf4789 100644
--- a/src/tests/JIT/SIMD/BugWithAVX_r.csproj
+++ b/src/tests/JIT/SIMD/BugWithAVX_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/BugWithAVX_ro.csproj b/src/tests/JIT/SIMD/BugWithAVX_ro.csproj
index 3e1dda7a659b3..edf1543b501ef 100644
--- a/src/tests/JIT/SIMD/BugWithAVX_ro.csproj
+++ b/src/tests/JIT/SIMD/BugWithAVX_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/CircleInConvex.cs b/src/tests/JIT/SIMD/CircleInConvex.cs
index 10623a15fdd43..3c7588d429b22 100644
--- a/src/tests/JIT/SIMD/CircleInConvex.cs
+++ b/src/tests/JIT/SIMD/CircleInConvex.cs
@@ -9,6 +9,7 @@
 using System.Numerics;
 
 using Point = System.Numerics.Vector2;
+using Xunit;
 
 
 namespace ClassLibrary
@@ -51,7 +52,7 @@ static public float max(float a, float b)
             return a > b ? a : b;
         }
 
-        static public void swap(ref float a, ref float b)
+        static internal void swap(ref float a, ref float b)
         {
             float c = a;
             a = b;
@@ -242,7 +243,8 @@ static float NextFloat(Random random)
             return (float)(mantissa * exponent);
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             List<Point> points = new List<Point>();
             Random random = new Random(13);
diff --git a/src/tests/JIT/SIMD/CircleInConvex_r.csproj b/src/tests/JIT/SIMD/CircleInConvex_r.csproj
index 2e470e6fd0485..263a34013e0f5 100644
--- a/src/tests/JIT/SIMD/CircleInConvex_r.csproj
+++ b/src/tests/JIT/SIMD/CircleInConvex_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/CircleInConvex_ro.csproj b/src/tests/JIT/SIMD/CircleInConvex_ro.csproj
index 8eaa1f87cee6d..a0b3a494a9333 100644
--- a/src/tests/JIT/SIMD/CircleInConvex_ro.csproj
+++ b/src/tests/JIT/SIMD/CircleInConvex_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/CreateGeneric.cs b/src/tests/JIT/SIMD/CreateGeneric.cs
index 46c309dd71c7e..16f91795e3c25 100644
--- a/src/tests/JIT/SIMD/CreateGeneric.cs
+++ b/src/tests/JIT/SIMD/CreateGeneric.cs
@@ -3,14 +3,16 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
 		const float EPS = Single.Epsilon * 5;
 		
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             var a = new System.Numerics.Vector<short>(51);
             for (int i = 0; i < System.Numerics.Vector<short>.Count; ++i)
diff --git a/src/tests/JIT/SIMD/CreateGeneric_r.csproj b/src/tests/JIT/SIMD/CreateGeneric_r.csproj
index dec6efb319ea9..d9f941977c763 100644
--- a/src/tests/JIT/SIMD/CreateGeneric_r.csproj
+++ b/src/tests/JIT/SIMD/CreateGeneric_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/CreateGeneric_ro.csproj b/src/tests/JIT/SIMD/CreateGeneric_ro.csproj
index 0d16954464092..6b29f0fd4e8c2 100644
--- a/src/tests/JIT/SIMD/CreateGeneric_ro.csproj
+++ b/src/tests/JIT/SIMD/CreateGeneric_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/CtorFromArray.cs b/src/tests/JIT/SIMD/CtorFromArray.cs
index 92332b55576ce..5aa8d0b6874d9 100644
--- a/src/tests/JIT/SIMD/CtorFromArray.cs
+++ b/src/tests/JIT/SIMD/CtorFromArray.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector<int>;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
         static int[] GenerateArray(int size, int value)
         {
@@ -18,7 +19,8 @@ static int[] GenerateArray(int size, int value)
             return arr;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int v = 2;
             int[] arr = GenerateArray(20, v);
diff --git a/src/tests/JIT/SIMD/CtorFromArray_r.csproj b/src/tests/JIT/SIMD/CtorFromArray_r.csproj
index 6929bd06f5517..417bbbcf83bec 100644
--- a/src/tests/JIT/SIMD/CtorFromArray_r.csproj
+++ b/src/tests/JIT/SIMD/CtorFromArray_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/CtorFromArray_ro.csproj b/src/tests/JIT/SIMD/CtorFromArray_ro.csproj
index bca6c144ff9fd..7f9faa9a69d17 100644
--- a/src/tests/JIT/SIMD/CtorFromArray_ro.csproj
+++ b/src/tests/JIT/SIMD/CtorFromArray_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Ctors.cs b/src/tests/JIT/SIMD/Ctors.cs
index 94fd04de29937..581c09c755b84 100644
--- a/src/tests/JIT/SIMD/Ctors.cs
+++ b/src/tests/JIT/SIMD/Ctors.cs
@@ -3,13 +3,14 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
 
-    class Program
+    public class Program
     {		
         const float EPS = Single.Epsilon * 5;
 
@@ -70,7 +71,8 @@ static int Vector4Ctors()
             return 100;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int returnVal = Pass;
             
diff --git a/src/tests/JIT/SIMD/Ctors_r.csproj b/src/tests/JIT/SIMD/Ctors_r.csproj
index 5e96b5029884c..3b5fb82906688 100644
--- a/src/tests/JIT/SIMD/Ctors_r.csproj
+++ b/src/tests/JIT/SIMD/Ctors_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Ctors_ro.csproj b/src/tests/JIT/SIMD/Ctors_ro.csproj
index 80fbb73605448..3f30423bd9054 100644
--- a/src/tests/JIT/SIMD/Ctors_ro.csproj
+++ b/src/tests/JIT/SIMD/Ctors_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Directory.Build.props b/src/tests/JIT/SIMD/Directory.Build.props
index 05722100b653f..689ebf8db31e1 100644
--- a/src/tests/JIT/SIMD/Directory.Build.props
+++ b/src/tests/JIT/SIMD/Directory.Build.props
@@ -1,23 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
+  <Import Project="..\..\Directory.Merged.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>
-    <CLRTestBatchPreCommands>
-      <![CDATA[
-$(CLRTestBatchPreCommands)
-if EXIST SIMD.log (del SIMD.log)
-]]>
-    </CLRTestBatchPreCommands>
-    <CLRTestBashPreCommands>
-      <![CDATA[
-$(CLRTestBashPreCommands)
-rm -f SIMD.log
-]]>
-    </CLRTestBashPreCommands>
+    <RunAnalyzers>true</RunAnalyzers>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
   </PropertyGroup>
-
-  <ItemGroup>
-    <CLRTestBashEnvironmentVariable Include="DOTNET_JitFuncInfoLogFile" Value="SIMD.log" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/tests/JIT/SIMD/DivSignedUnsignedTest.cs b/src/tests/JIT/SIMD/DivSignedUnsignedTest.cs
index dbb0576799c7d..19dd7d2422429 100644
--- a/src/tests/JIT/SIMD/DivSignedUnsignedTest.cs
+++ b/src/tests/JIT/SIMD/DivSignedUnsignedTest.cs
@@ -3,12 +3,14 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             {
                 var a = new Vector<uint>(1000000);
diff --git a/src/tests/JIT/SIMD/DivSignedUnsignedTest_r.csproj b/src/tests/JIT/SIMD/DivSignedUnsignedTest_r.csproj
index 0289d559815c9..5c20066d28bd6 100644
--- a/src/tests/JIT/SIMD/DivSignedUnsignedTest_r.csproj
+++ b/src/tests/JIT/SIMD/DivSignedUnsignedTest_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/DivSignedUnsignedTest_ro.csproj b/src/tests/JIT/SIMD/DivSignedUnsignedTest_ro.csproj
index d687a7459209b..a7f2a81ae016a 100644
--- a/src/tests/JIT/SIMD/DivSignedUnsignedTest_ro.csproj
+++ b/src/tests/JIT/SIMD/DivSignedUnsignedTest_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Dup.cs b/src/tests/JIT/SIMD/Dup.cs
index 6335218bd397e..078c40cfff8be 100644
--- a/src/tests/JIT/SIMD/Dup.cs
+++ b/src/tests/JIT/SIMD/Dup.cs
@@ -3,13 +3,15 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector4;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
         static Point a;
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point p = new Point(1, 2, 3, 4);
             Point c = p;
diff --git a/src/tests/JIT/SIMD/Dup_r.csproj b/src/tests/JIT/SIMD/Dup_r.csproj
index 79707c6fdf73b..16e9616239c85 100644
--- a/src/tests/JIT/SIMD/Dup_r.csproj
+++ b/src/tests/JIT/SIMD/Dup_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Dup_ro.csproj b/src/tests/JIT/SIMD/Dup_ro.csproj
index a9f8cdc77af87..9ae67f14626cf 100644
--- a/src/tests/JIT/SIMD/Dup_ro.csproj
+++ b/src/tests/JIT/SIMD/Dup_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric.cs b/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric.cs
index 75ae3ffde0682..586bec45fff6e 100644
--- a/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric.cs
+++ b/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector<double>;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
 		const float EPS = Single.Epsilon * 5;
         public const int DefaultSeed = 20010415;
@@ -140,7 +141,8 @@ static bool checkEQ(double[] a, double[] b)
             return true;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Random random = new Random(Seed);
             int count = Point.Count;
diff --git a/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric_r.csproj b/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric_r.csproj
index f93ba0a38de1a..3ba0aa034aa7d 100644
--- a/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric_r.csproj
+++ b/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric_ro.csproj b/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric_ro.csproj
index dc388964243a5..08c1b940f9635 100644
--- a/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric_ro.csproj
+++ b/src/tests/JIT/SIMD/Haar-likeFeaturesGeneric_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/JIT.SIMD.csproj b/src/tests/JIT/SIMD/JIT.SIMD.csproj
new file mode 100644
index 0000000000000..24bc1f562a9c2
--- /dev/null
+++ b/src/tests/JIT/SIMD/JIT.SIMD.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <MergedWrapperProjectReference Include="**/*.??proj" />
+    <MergedWrapperProjectReference Remove="$(MSBuildThisFileFullPath)" />
+  </ItemGroup>
+
+  <Import Project="$(TestSourceDir)MergedTestRunner.targets" />
+</Project>
diff --git a/src/tests/JIT/SIMD/Ldfld.cs b/src/tests/JIT/SIMD/Ldfld.cs
index 7f4b504a2196f..462a5c054571b 100644
--- a/src/tests/JIT/SIMD/Ldfld.cs
+++ b/src/tests/JIT/SIMD/Ldfld.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector4;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
         static float Do(Point p)
         {
@@ -23,7 +24,8 @@ class C
             public Point p;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point p = new Point(1, 2, 3, 4);
 
diff --git a/src/tests/JIT/SIMD/LdfldGeneric.cs b/src/tests/JIT/SIMD/LdfldGeneric.cs
index 687a49aa70b03..a80637986c70f 100644
--- a/src/tests/JIT/SIMD/LdfldGeneric.cs
+++ b/src/tests/JIT/SIMD/LdfldGeneric.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector<int>;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
         static float Do(Point p)
         {
@@ -23,7 +24,8 @@ class C
             public Point p;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point p = new Point(1);
 
diff --git a/src/tests/JIT/SIMD/LdfldGeneric_r.csproj b/src/tests/JIT/SIMD/LdfldGeneric_r.csproj
index 1431c1dfa5802..8898aa66330b1 100644
--- a/src/tests/JIT/SIMD/LdfldGeneric_r.csproj
+++ b/src/tests/JIT/SIMD/LdfldGeneric_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/LdfldGeneric_ro.csproj b/src/tests/JIT/SIMD/LdfldGeneric_ro.csproj
index a37f36d7df5ff..06e01e23cd0c1 100644
--- a/src/tests/JIT/SIMD/LdfldGeneric_ro.csproj
+++ b/src/tests/JIT/SIMD/LdfldGeneric_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Ldfld_r.csproj b/src/tests/JIT/SIMD/Ldfld_r.csproj
index 28c77e03b664f..936a99caca46b 100644
--- a/src/tests/JIT/SIMD/Ldfld_r.csproj
+++ b/src/tests/JIT/SIMD/Ldfld_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Ldfld_ro.csproj b/src/tests/JIT/SIMD/Ldfld_ro.csproj
index 6433a57a7f117..723dc736a11ef 100644
--- a/src/tests/JIT/SIMD/Ldfld_ro.csproj
+++ b/src/tests/JIT/SIMD/Ldfld_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Ldind.cs b/src/tests/JIT/SIMD/Ldind.cs
index a592c56befb59..d9f50ec4e64bf 100644
--- a/src/tests/JIT/SIMD/Ldind.cs
+++ b/src/tests/JIT/SIMD/Ldind.cs
@@ -4,12 +4,14 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Point = System.Numerics.Vector4;
+using Xunit;
 
 namespace Test
 { 
-    static class Program
+    public static class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point x = new Point(1);
 			Point y, z;
diff --git a/src/tests/JIT/SIMD/Ldind_r.csproj b/src/tests/JIT/SIMD/Ldind_r.csproj
index 890b6a1c21ccd..def24f2e3b9d6 100644
--- a/src/tests/JIT/SIMD/Ldind_r.csproj
+++ b/src/tests/JIT/SIMD/Ldind_r.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/JIT/SIMD/Ldind_ro.csproj b/src/tests/JIT/SIMD/Ldind_ro.csproj
index af7ec387c66d5..06541bf005d40 100644
--- a/src/tests/JIT/SIMD/Ldind_ro.csproj
+++ b/src/tests/JIT/SIMD/Ldind_ro.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/JIT/SIMD/Matrix4x4.cs b/src/tests/JIT/SIMD/Matrix4x4.cs
index ef96409702153..7de0d7bc4a18f 100644
--- a/src/tests/JIT/SIMD/Matrix4x4.cs
+++ b/src/tests/JIT/SIMD/Matrix4x4.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Numerics;
+using Xunit;
 
-class Matrix4x4Test
+public class Matrix4x4Test
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -30,7 +31,8 @@ public static int Matrix4x4CreateScaleCenterTest3()
         return returnVal;
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return Matrix4x4CreateScaleCenterTest3();
     }
diff --git a/src/tests/JIT/SIMD/Matrix4x4_r.csproj b/src/tests/JIT/SIMD/Matrix4x4_r.csproj
index b4e8f5f054dbd..09da6cc7767e1 100644
--- a/src/tests/JIT/SIMD/Matrix4x4_r.csproj
+++ b/src/tests/JIT/SIMD/Matrix4x4_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Matrix4x4_ro.csproj b/src/tests/JIT/SIMD/Matrix4x4_ro.csproj
index 05c2df88c3ee9..c326443ce8e8e 100644
--- a/src/tests/JIT/SIMD/Matrix4x4_ro.csproj
+++ b/src/tests/JIT/SIMD/Matrix4x4_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/MinMax.cs b/src/tests/JIT/SIMD/MinMax.cs
index b206a46518780..8f55accad8fd0 100644
--- a/src/tests/JIT/SIMD/MinMax.cs
+++ b/src/tests/JIT/SIMD/MinMax.cs
@@ -3,12 +3,14 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector4;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point a = new Point(10, 50,0,-100);
             Point b = new Point(10);
diff --git a/src/tests/JIT/SIMD/MinMax_r.csproj b/src/tests/JIT/SIMD/MinMax_r.csproj
index ce7d4400a6539..babab50723f36 100644
--- a/src/tests/JIT/SIMD/MinMax_r.csproj
+++ b/src/tests/JIT/SIMD/MinMax_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/MinMax_ro.csproj b/src/tests/JIT/SIMD/MinMax_ro.csproj
index e89d34a045ec2..f33fde9050ca5 100644
--- a/src/tests/JIT/SIMD/MinMax_ro.csproj
+++ b/src/tests/JIT/SIMD/MinMax_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Mul.cs b/src/tests/JIT/SIMD/Mul.cs
index fb9c686773e24..40f3966f66bbd 100644
--- a/src/tests/JIT/SIMD/Mul.cs
+++ b/src/tests/JIT/SIMD/Mul.cs
@@ -3,12 +3,14 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector2;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
 			Point a = new Point(10, 50);
 			Point b = new Point(10, 10);
diff --git a/src/tests/JIT/SIMD/Mul_r.csproj b/src/tests/JIT/SIMD/Mul_r.csproj
index 317e7b5ba4303..067d030f719a3 100644
--- a/src/tests/JIT/SIMD/Mul_r.csproj
+++ b/src/tests/JIT/SIMD/Mul_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/Mul_ro.csproj b/src/tests/JIT/SIMD/Mul_ro.csproj
index a6c2541005293..627e232278bad 100644
--- a/src/tests/JIT/SIMD/Mul_ro.csproj
+++ b/src/tests/JIT/SIMD/Mul_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Plane.cs b/src/tests/JIT/SIMD/Plane.cs
index 442d5fdc56518..9b82f08767d53 100644
--- a/src/tests/JIT/SIMD/Plane.cs
+++ b/src/tests/JIT/SIMD/Plane.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Numerics;
+using Xunit;
 
-class PlaneTest
+public class PlaneTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -25,7 +26,8 @@ public static int PlaneCreateFromVerticesTest()
         return returnVal;
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return PlaneCreateFromVerticesTest();
     }
diff --git a/src/tests/JIT/SIMD/Plane_r.csproj b/src/tests/JIT/SIMD/Plane_r.csproj
index f9f1f8d3a9a13..ee203df9d3bcf 100644
--- a/src/tests/JIT/SIMD/Plane_r.csproj
+++ b/src/tests/JIT/SIMD/Plane_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Plane_ro.csproj b/src/tests/JIT/SIMD/Plane_ro.csproj
index 022e58fde226d..0ceae23873f03 100644
--- a/src/tests/JIT/SIMD/Plane_ro.csproj
+++ b/src/tests/JIT/SIMD/Plane_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/ShiftOperations.cs b/src/tests/JIT/SIMD/ShiftOperations.cs
index 5122d261bdeda..fa678926aa924 100644
--- a/src/tests/JIT/SIMD/ShiftOperations.cs
+++ b/src/tests/JIT/SIMD/ShiftOperations.cs
@@ -5,6 +5,7 @@
 using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
+using Xunit;
 
 public class Test
 {
@@ -80,7 +81,8 @@ private static R Shrx64bit<T, R>(T x, int y)
     [MethodImpl(MethodImplOptions.NoInlining)]
     private static unsafe int ShrxRef64bit(ushort* x, int y) => *x >> y;
 
-    public static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         const int PASS = 100;
         const int FAIL = 101;
diff --git a/src/tests/JIT/SIMD/ShiftOperations.csproj b/src/tests/JIT/SIMD/ShiftOperations.csproj
index d7141b8f4b160..5adf5d1b9a0ce 100644
--- a/src/tests/JIT/SIMD/ShiftOperations.csproj
+++ b/src/tests/JIT/SIMD/ShiftOperations.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
 	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/SimpleSIMDProgram.cs b/src/tests/JIT/SIMD/SimpleSIMDProgram.cs
index bfe36fd2a58bb..a69392052d710 100644
--- a/src/tests/JIT/SIMD/SimpleSIMDProgram.cs
+++ b/src/tests/JIT/SIMD/SimpleSIMDProgram.cs
@@ -2,12 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Numerics;
+using Xunit;
 
 namespace SIMDDebugTest
 {
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Vector4Test.RunTests();
             Vector3Test.RunTests();
diff --git a/src/tests/JIT/SIMD/SimpleSIMDProgram.csproj b/src/tests/JIT/SIMD/SimpleSIMDProgram.csproj
index 0177f3a4439ec..c3630b3987240 100644
--- a/src/tests/JIT/SIMD/SimpleSIMDProgram.csproj
+++ b/src/tests/JIT/SIMD/SimpleSIMDProgram.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/SqrtGeneric.cs b/src/tests/JIT/SIMD/SqrtGeneric.cs
index 6a5367257a4d3..dc84fbab8ae45 100644
--- a/src/tests/JIT/SIMD/SqrtGeneric.cs
+++ b/src/tests/JIT/SIMD/SqrtGeneric.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
         public const int DefaultSeed = 20010415;
         public static int Seed = Environment.GetEnvironmentVariable("CORECLR_SEED") switch
@@ -16,7 +17,8 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
             _ => DefaultSeed
         };
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Random random = new Random(Seed);
             var a = new System.Numerics.Vector<short>(25);
diff --git a/src/tests/JIT/SIMD/SqrtGeneric_r.csproj b/src/tests/JIT/SIMD/SqrtGeneric_r.csproj
index d4d3a48d1ccad..a55b1d27c231f 100644
--- a/src/tests/JIT/SIMD/SqrtGeneric_r.csproj
+++ b/src/tests/JIT/SIMD/SqrtGeneric_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/SqrtGeneric_ro.csproj b/src/tests/JIT/SIMD/SqrtGeneric_ro.csproj
index 6047c83d2d8e3..5a9a8c3dd4537 100644
--- a/src/tests/JIT/SIMD/SqrtGeneric_ro.csproj
+++ b/src/tests/JIT/SIMD/SqrtGeneric_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/StoreElement.cs b/src/tests/JIT/SIMD/StoreElement.cs
index f691d59b36843..35634fe420183 100644
--- a/src/tests/JIT/SIMD/StoreElement.cs
+++ b/src/tests/JIT/SIMD/StoreElement.cs
@@ -3,12 +3,14 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector<int>;
+using Xunit;
 
 namespace VectorTests
 {
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point p = new Point(1);
             Point[] arr = new Point[10];
diff --git a/src/tests/JIT/SIMD/StoreElement_r.csproj b/src/tests/JIT/SIMD/StoreElement_r.csproj
index f0615c54cf76a..d976a8248ea52 100644
--- a/src/tests/JIT/SIMD/StoreElement_r.csproj
+++ b/src/tests/JIT/SIMD/StoreElement_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/StoreElement_ro.csproj b/src/tests/JIT/SIMD/StoreElement_ro.csproj
index c196f57895b75..1e141feed215f 100644
--- a/src/tests/JIT/SIMD/StoreElement_ro.csproj
+++ b/src/tests/JIT/SIMD/StoreElement_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Sums.cs b/src/tests/JIT/SIMD/Sums.cs
index 2b0053d88835d..604c1e5d9310e 100644
--- a/src/tests/JIT/SIMD/Sums.cs
+++ b/src/tests/JIT/SIMD/Sums.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector4;
+using Xunit;
 
 namespace VectorMathTests
 {
-    class Program
+    public class Program
     {
         public const int DefaultSeed = 20010415;
         public static int Seed = Environment.GetEnvironmentVariable("CORECLR_SEED") switch
@@ -38,7 +39,8 @@ static float sum(Point[] arr)
             return s.X;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             System.Diagnostics.Stopwatch clock = new System.Diagnostics.Stopwatch();
             clock.Start();
diff --git a/src/tests/JIT/SIMD/Sums_r.csproj b/src/tests/JIT/SIMD/Sums_r.csproj
index 9eeb0078c8ddb..9787a042da0c1 100644
--- a/src/tests/JIT/SIMD/Sums_r.csproj
+++ b/src/tests/JIT/SIMD/Sums_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Sums_ro.csproj b/src/tests/JIT/SIMD/Sums_ro.csproj
index 888382637c5c2..59553bcb06f1f 100644
--- a/src/tests/JIT/SIMD/Sums_ro.csproj
+++ b/src/tests/JIT/SIMD/Sums_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Vector3.cs b/src/tests/JIT/SIMD/Vector3.cs
index 1e1fd644c0a86..cdd473a791b0b 100644
--- a/src/tests/JIT/SIMD/Vector3.cs
+++ b/src/tests/JIT/SIMD/Vector3.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector3;
+using Xunit;
 
 namespace VectorTests
 {
-    class Program
+    public class Program
     {
         const float EPS = Single.Epsilon * 5;
 		
@@ -15,7 +16,8 @@ static bool CheckEQ(float a, float b)
             return Math.Abs(a - b) < EPS;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point a = new Point(1, 2, 3);
             Point b = new Point(2, 2, 5);
diff --git a/src/tests/JIT/SIMD/Vector3GetHash.cs b/src/tests/JIT/SIMD/Vector3GetHash.cs
index 64d7c96bd7117..e67e209ece335 100644
--- a/src/tests/JIT/SIMD/Vector3GetHash.cs
+++ b/src/tests/JIT/SIMD/Vector3GetHash.cs
@@ -11,8 +11,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -60,7 +61,8 @@ public static void Vector3GetHashCodeTest()
             Assert.NotEqual(v7.GetHashCode(), v9.GetHashCode());
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/Vector3GetHash_r.csproj b/src/tests/JIT/SIMD/Vector3GetHash_r.csproj
index 9adfd0c26f531..9b2514a144e0d 100644
--- a/src/tests/JIT/SIMD/Vector3GetHash_r.csproj
+++ b/src/tests/JIT/SIMD/Vector3GetHash_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/Vector3GetHash_ro.csproj b/src/tests/JIT/SIMD/Vector3GetHash_ro.csproj
index 441e856a0ce7b..c67d0ce4e9f28 100644
--- a/src/tests/JIT/SIMD/Vector3GetHash_ro.csproj
+++ b/src/tests/JIT/SIMD/Vector3GetHash_ro.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/Vector3Interop.cs b/src/tests/JIT/SIMD/Vector3Interop.cs
index fa402d3ae7e0c..2984709707227 100644
--- a/src/tests/JIT/SIMD/Vector3Interop.cs
+++ b/src/tests/JIT/SIMD/Vector3Interop.cs
@@ -21,6 +21,7 @@
 using System.Numerics;
 using System.Runtime.InteropServices;
 using System.Text;
+using Xunit;
 
 
 public struct DT 
@@ -549,9 +550,10 @@ public static bool test() {
     }     
 }
 
-class Test_Vector3Interop 
+public class Test_Vector3Interop 
 {  
-    public static int Main() 
+    [Fact]
+    public static int TestEntryPoint() 
     {
 
         if (!PInvokeTest.test()) 
diff --git a/src/tests/JIT/SIMD/Vector3Interop_r.csproj b/src/tests/JIT/SIMD/Vector3Interop_r.csproj
index 4fc3951b80bd6..86878e7bb9c45 100644
--- a/src/tests/JIT/SIMD/Vector3Interop_r.csproj
+++ b/src/tests/JIT/SIMD/Vector3Interop_r.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CMakeProjectReference -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/SIMD/Vector3Interop_ro.csproj b/src/tests/JIT/SIMD/Vector3Interop_ro.csproj
index 286abb4b67082..543f0229bb607 100644
--- a/src/tests/JIT/SIMD/Vector3Interop_ro.csproj
+++ b/src/tests/JIT/SIMD/Vector3Interop_ro.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CMakeProjectReference -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/SIMD/Vector3_r.csproj b/src/tests/JIT/SIMD/Vector3_r.csproj
index bf64cbef6feda..c3496bf06693f 100644
--- a/src/tests/JIT/SIMD/Vector3_r.csproj
+++ b/src/tests/JIT/SIMD/Vector3_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Vector3_ro.csproj b/src/tests/JIT/SIMD/Vector3_ro.csproj
index 31e39d9c843bd..97418e2c8c705 100644
--- a/src/tests/JIT/SIMD/Vector3_ro.csproj
+++ b/src/tests/JIT/SIMD/Vector3_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/Vector4.cs b/src/tests/JIT/SIMD/Vector4.cs
index 61b31ac878b6a..288265fb38345 100644
--- a/src/tests/JIT/SIMD/Vector4.cs
+++ b/src/tests/JIT/SIMD/Vector4.cs
@@ -3,10 +3,11 @@
 using System;
 using System.Collections.Generic;
 using Point = System.Numerics.Vector4;
+using Xunit;
 
 namespace VectorTests
 {
-    class Program
+    public class Program
     {
         const float EPS = Single.Epsilon * 5;
 
@@ -15,7 +16,8 @@ static bool CheckEQ(float a, float b)
             return Math.Abs(a - b) < EPS;
         }
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Point a = new Point(1, 2, 3, 4);
             Point b = new Point(2, 2, 1, 1);
diff --git a/src/tests/JIT/SIMD/Vector4_r.csproj b/src/tests/JIT/SIMD/Vector4_r.csproj
index 3f433f2aa762c..689eedafe6055 100644
--- a/src/tests/JIT/SIMD/Vector4_r.csproj
+++ b/src/tests/JIT/SIMD/Vector4_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/Vector4_ro.csproj b/src/tests/JIT/SIMD/Vector4_ro.csproj
index 7ddae696e072c..103b176beba62 100644
--- a/src/tests/JIT/SIMD/Vector4_ro.csproj
+++ b/src/tests/JIT/SIMD/Vector4_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorAbs.cs b/src/tests/JIT/SIMD/VectorAbs.cs
index f4f8936d5ac07..5a11e0531a919 100644
--- a/src/tests/JIT/SIMD/VectorAbs.cs
+++ b/src/tests/JIT/SIMD/VectorAbs.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -67,7 +68,8 @@ public static int VectorAbs()
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/VectorAbs_r.csproj b/src/tests/JIT/SIMD/VectorAbs_r.csproj
index ad362660da247..4ec826b2d04a3 100644
--- a/src/tests/JIT/SIMD/VectorAbs_r.csproj
+++ b/src/tests/JIT/SIMD/VectorAbs_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorAbs_ro.csproj b/src/tests/JIT/SIMD/VectorAbs_ro.csproj
index c1f3a3e1680f6..070c5079077e5 100644
--- a/src/tests/JIT/SIMD/VectorAbs_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorAbs_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorAdd.cs b/src/tests/JIT/SIMD/VectorAdd.cs
index 034f1cdd3f62f..bd5daa1e96ee2 100644
--- a/src/tests/JIT/SIMD/VectorAdd.cs
+++ b/src/tests/JIT/SIMD/VectorAdd.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -69,7 +70,8 @@ public static int VectorAdd()
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorAddTest<float>.VectorAdd(1, 2, (float)(1 + 2)) != Pass) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorAdd_r.csproj b/src/tests/JIT/SIMD/VectorAdd_r.csproj
index 5a4b9658360f8..22c471626229e 100644
--- a/src/tests/JIT/SIMD/VectorAdd_r.csproj
+++ b/src/tests/JIT/SIMD/VectorAdd_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorAdd_ro.csproj b/src/tests/JIT/SIMD/VectorAdd_ro.csproj
index b78687ebd4419..6d09b2e41ca6b 100644
--- a/src/tests/JIT/SIMD/VectorAdd_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorAdd_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorArgs.cs b/src/tests/JIT/SIMD/VectorArgs.cs
index 6960448b75e39..b8abc1f8696b9 100644
--- a/src/tests/JIT/SIMD/VectorArgs.cs
+++ b/src/tests/JIT/SIMD/VectorArgs.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
 internal class Color
 {
@@ -29,7 +30,7 @@ public Color Change(float f)
     public Vector<float> RGB { get { return _rgb; } }
 }
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private static int VectorArgs()
     {
@@ -59,7 +60,8 @@ private static int VectorArgs()
         return Pass;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return VectorArgs();
     }
diff --git a/src/tests/JIT/SIMD/VectorArgs_r.csproj b/src/tests/JIT/SIMD/VectorArgs_r.csproj
index 83dfe64734f6a..8f7f986911fa0 100644
--- a/src/tests/JIT/SIMD/VectorArgs_r.csproj
+++ b/src/tests/JIT/SIMD/VectorArgs_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorArgs_ro.csproj b/src/tests/JIT/SIMD/VectorArgs_ro.csproj
index 7368953390ad2..1b660e481939b 100644
--- a/src/tests/JIT/SIMD/VectorArgs_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorArgs_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorArray.cs b/src/tests/JIT/SIMD/VectorArray.cs
index 4de968286287f..269ddc48af36a 100644
--- a/src/tests/JIT/SIMD/VectorArray.cs
+++ b/src/tests/JIT/SIMD/VectorArray.cs
@@ -6,8 +6,9 @@
 using System.Numerics;
 using System.Runtime.Intrinsics.Arm;
 using System.Runtime.Intrinsics.X86;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -141,7 +142,8 @@ static public int VectorArray(float deltaValue)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         try
diff --git a/src/tests/JIT/SIMD/VectorArrayInit.cs b/src/tests/JIT/SIMD/VectorArrayInit.cs
index 03659b9935241..662a7b9703d3e 100644
--- a/src/tests/JIT/SIMD/VectorArrayInit.cs
+++ b/src/tests/JIT/SIMD/VectorArrayInit.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -125,7 +126,8 @@ public static int VectorArrayInit(int size, Random random)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         Random random = new Random(Seed);
diff --git a/src/tests/JIT/SIMD/VectorArrayInit_r.csproj b/src/tests/JIT/SIMD/VectorArrayInit_r.csproj
index 8882cc2413e6e..3db76ce4ae123 100644
--- a/src/tests/JIT/SIMD/VectorArrayInit_r.csproj
+++ b/src/tests/JIT/SIMD/VectorArrayInit_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorArrayInit_ro.csproj b/src/tests/JIT/SIMD/VectorArrayInit_ro.csproj
index 13d13f8202c86..2cbc0f240dca2 100644
--- a/src/tests/JIT/SIMD/VectorArrayInit_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorArrayInit_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorArray_r.csproj b/src/tests/JIT/SIMD/VectorArray_r.csproj
index 1989536a05427..3e104522db167 100644
--- a/src/tests/JIT/SIMD/VectorArray_r.csproj
+++ b/src/tests/JIT/SIMD/VectorArray_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorArray_ro.csproj b/src/tests/JIT/SIMD/VectorArray_ro.csproj
index 38e31223c41b8..7baca7b65cfe7 100644
--- a/src/tests/JIT/SIMD/VectorArray_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorArray_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorCast.cs b/src/tests/JIT/SIMD/VectorCast.cs
index b32e21e50a454..8e4edd05a37c0 100644
--- a/src/tests/JIT/SIMD/VectorCast.cs
+++ b/src/tests/JIT/SIMD/VectorCast.cs
@@ -5,8 +5,9 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     const int Pass = 100;
     const int Fail = -1;
@@ -74,7 +75,8 @@ static bool ReportFailure(bool success, [CallerLineNumber] int line = 0)
         return success;
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         bool succeeded = true;
 
diff --git a/src/tests/JIT/SIMD/VectorCast_r.csproj b/src/tests/JIT/SIMD/VectorCast_r.csproj
index 9dc3335362116..1684ae9a71551 100644
--- a/src/tests/JIT/SIMD/VectorCast_r.csproj
+++ b/src/tests/JIT/SIMD/VectorCast_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorCast_ro.csproj b/src/tests/JIT/SIMD/VectorCast_ro.csproj
index 5a38fad276e0d..7efd424d56500 100644
--- a/src/tests/JIT/SIMD/VectorCast_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorCast_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorCeilFloor.cs b/src/tests/JIT/SIMD/VectorCeilFloor.cs
index 5c7cdfa2cb407..8914fc4c1d364 100644
--- a/src/tests/JIT/SIMD/VectorCeilFloor.cs
+++ b/src/tests/JIT/SIMD/VectorCeilFloor.cs
@@ -4,13 +4,15 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         
diff --git a/src/tests/JIT/SIMD/VectorCeilFloor_r.csproj b/src/tests/JIT/SIMD/VectorCeilFloor_r.csproj
index 9f98e36c4a3e5..6e1206199f369 100644
--- a/src/tests/JIT/SIMD/VectorCeilFloor_r.csproj
+++ b/src/tests/JIT/SIMD/VectorCeilFloor_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/VectorCeilFloor_ro.csproj b/src/tests/JIT/SIMD/VectorCeilFloor_ro.csproj
index 95c2407f138c2..5041371bf8309 100644
--- a/src/tests/JIT/SIMD/VectorCeilFloor_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorCeilFloor_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorConvert.cs b/src/tests/JIT/SIMD/VectorConvert.cs
index 3821c81bf464f..9bd57b9400898 100644
--- a/src/tests/JIT/SIMD/VectorConvert.cs
+++ b/src/tests/JIT/SIMD/VectorConvert.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-partial class VectorTest
+public partial class VectorTest
 {
     const int Pass = 100;
     const int Fail = -1;
@@ -493,7 +494,8 @@ public static int VectorConvertUInt16And8(Vector<UInt16> A1, Vector<UInt16> A2)
         }
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/VectorConvert_r_Target_32Bit.csproj b/src/tests/JIT/SIMD/VectorConvert_r_Target_32Bit.csproj
index df5a5a70befdd..6247dba66f559 100644
--- a/src/tests/JIT/SIMD/VectorConvert_r_Target_32Bit.csproj
+++ b/src/tests/JIT/SIMD/VectorConvert_r_Target_32Bit.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <DefineConstants>TARGET_32BIT;$(DefineConstants)</DefineConstants>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/SIMD/VectorConvert_r_Target_64Bit.csproj b/src/tests/JIT/SIMD/VectorConvert_r_Target_64Bit.csproj
index fe343d2463935..f1b5f839185ed 100644
--- a/src/tests/JIT/SIMD/VectorConvert_r_Target_64Bit.csproj
+++ b/src/tests/JIT/SIMD/VectorConvert_r_Target_64Bit.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/SIMD/VectorConvert_ro_Target_32Bit.csproj b/src/tests/JIT/SIMD/VectorConvert_ro_Target_32Bit.csproj
index dc59717debc5d..97fff57f2d9b4 100644
--- a/src/tests/JIT/SIMD/VectorConvert_ro_Target_32Bit.csproj
+++ b/src/tests/JIT/SIMD/VectorConvert_ro_Target_32Bit.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <DefineConstants>TARGET_32BIT;$(DefineConstants)</DefineConstants>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/JIT/SIMD/VectorConvert_ro_Target_64Bit.csproj b/src/tests/JIT/SIMD/VectorConvert_ro_Target_64Bit.csproj
index 7e03015f48470..695caec06b37b 100644
--- a/src/tests/JIT/SIMD/VectorConvert_ro_Target_64Bit.csproj
+++ b/src/tests/JIT/SIMD/VectorConvert_ro_Target_64Bit.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
     <DebugType>None</DebugType>
diff --git a/src/tests/JIT/SIMD/VectorCopyToArray.cs b/src/tests/JIT/SIMD/VectorCopyToArray.cs
index e33af5422c253..7a429161e5620 100644
--- a/src/tests/JIT/SIMD/VectorCopyToArray.cs
+++ b/src/tests/JIT/SIMD/VectorCopyToArray.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -126,7 +127,8 @@ public static int VectorCopyToArray(int size, Random random)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         Random random = new Random(Seed);
diff --git a/src/tests/JIT/SIMD/VectorCopyToArray_r.csproj b/src/tests/JIT/SIMD/VectorCopyToArray_r.csproj
index 654cb6a6e9086..3f2c6eb2eb617 100644
--- a/src/tests/JIT/SIMD/VectorCopyToArray_r.csproj
+++ b/src/tests/JIT/SIMD/VectorCopyToArray_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorCopyToArray_ro.csproj b/src/tests/JIT/SIMD/VectorCopyToArray_ro.csproj
index fba477403abc1..3217c0b62bd64 100644
--- a/src/tests/JIT/SIMD/VectorCopyToArray_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorCopyToArray_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorDiv.cs b/src/tests/JIT/SIMD/VectorDiv.cs
index bba58b88f9e3a..20d5b0df0922d 100644
--- a/src/tests/JIT/SIMD/VectorDiv.cs
+++ b/src/tests/JIT/SIMD/VectorDiv.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -70,7 +71,8 @@ public static int VectorDiv(float left, float right, float result)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorMulTest<float>.VectorDiv(6f, 2f, 6f / 2f) != Pass) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorDiv_r.csproj b/src/tests/JIT/SIMD/VectorDiv_r.csproj
index 990720b59f02d..ad673c93fb973 100644
--- a/src/tests/JIT/SIMD/VectorDiv_r.csproj
+++ b/src/tests/JIT/SIMD/VectorDiv_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorDiv_ro.csproj b/src/tests/JIT/SIMD/VectorDiv_ro.csproj
index a23248456b5f4..2641e3e658ce0 100644
--- a/src/tests/JIT/SIMD/VectorDiv_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorDiv_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorDot.cs b/src/tests/JIT/SIMD/VectorDot.cs
index 1bc057eea7b87..3bac9acc3c552 100644
--- a/src/tests/JIT/SIMD/VectorDot.cs
+++ b/src/tests/JIT/SIMD/VectorDot.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -94,7 +95,8 @@ public static int VectorDot(float left, float right, float checkResult)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorDotTest<float>.VectorDot(3f, 2f, 6f * Vector<float>.Count) != Pass) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorDot_r.csproj b/src/tests/JIT/SIMD/VectorDot_r.csproj
index ed357b129f219..d50cb55bc2bf4 100644
--- a/src/tests/JIT/SIMD/VectorDot_r.csproj
+++ b/src/tests/JIT/SIMD/VectorDot_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorDot_ro.csproj b/src/tests/JIT/SIMD/VectorDot_ro.csproj
index b8648f550a112..746124161052e 100644
--- a/src/tests/JIT/SIMD/VectorDot_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorDot_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorExp.cs b/src/tests/JIT/SIMD/VectorExp.cs
index 306d2cfe2bc35..bf0ddfea21937 100644
--- a/src/tests/JIT/SIMD/VectorExp.cs
+++ b/src/tests/JIT/SIMD/VectorExp.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -42,7 +43,8 @@ public static int VectorExp(Vector<T> x, T checkValue, T epsilon, T allowableErr
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/VectorExp_r.csproj b/src/tests/JIT/SIMD/VectorExp_r.csproj
index f67884b1d8d01..a710da1861c4f 100644
--- a/src/tests/JIT/SIMD/VectorExp_r.csproj
+++ b/src/tests/JIT/SIMD/VectorExp_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorExp_ro.csproj b/src/tests/JIT/SIMD/VectorExp_ro.csproj
index b860957fca63b..df0d1d9ec131f 100644
--- a/src/tests/JIT/SIMD/VectorExp_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorExp_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorGet.cs b/src/tests/JIT/SIMD/VectorGet.cs
index aa9fb118eb2ba..51c78f292664a 100644
--- a/src/tests/JIT/SIMD/VectorGet.cs
+++ b/src/tests/JIT/SIMD/VectorGet.cs
@@ -7,8 +7,9 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics.Arm;
 using System.Runtime.Intrinsics.X86;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -168,7 +169,8 @@ public static int VectorGetIndexerOutOfRange(T value, int index)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorGetTest<Double>.VectorGet(101D, 1) == Fail) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorGet_r.csproj b/src/tests/JIT/SIMD/VectorGet_r.csproj
index 872c9f5b7d0e0..189afc48ef10f 100644
--- a/src/tests/JIT/SIMD/VectorGet_r.csproj
+++ b/src/tests/JIT/SIMD/VectorGet_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorGet_ro.csproj b/src/tests/JIT/SIMD/VectorGet_ro.csproj
index 650eb9b7b2c40..61b1f4cd3a239 100644
--- a/src/tests/JIT/SIMD/VectorGet_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorGet_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorHWAccel.cs b/src/tests/JIT/SIMD/VectorHWAccel.cs
index c54001bea422c..1dc91cef93953 100644
--- a/src/tests/JIT/SIMD/VectorHWAccel.cs
+++ b/src/tests/JIT/SIMD/VectorHWAccel.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -35,7 +36,8 @@ public static int VectorHWAccel(T a, T b, T c)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorHWAccelTest<float>.VectorHWAccel(1, 2, (float)(1 + 2)) != Pass) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorHWAccel2.cs b/src/tests/JIT/SIMD/VectorHWAccel2.cs
index 51ec235b4ea7c..fd47483dfd7b6 100644
--- a/src/tests/JIT/SIMD/VectorHWAccel2.cs
+++ b/src/tests/JIT/SIMD/VectorHWAccel2.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -28,7 +29,8 @@ public static int VectorHWAccel2(T a, T b, T c)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if (Vector.IsHardwareAccelerated)
         {
diff --git a/src/tests/JIT/SIMD/VectorHWAccel2_r.csproj b/src/tests/JIT/SIMD/VectorHWAccel2_r.csproj
index 55f8ba4a4cf8d..2f15d50626a20 100644
--- a/src/tests/JIT/SIMD/VectorHWAccel2_r.csproj
+++ b/src/tests/JIT/SIMD/VectorHWAccel2_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorHWAccel2_ro.csproj b/src/tests/JIT/SIMD/VectorHWAccel2_ro.csproj
index d6af406cc0038..71b0af7066a6c 100644
--- a/src/tests/JIT/SIMD/VectorHWAccel2_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorHWAccel2_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorHWAccel_r.csproj b/src/tests/JIT/SIMD/VectorHWAccel_r.csproj
index 917a0bd494e5d..44fa05ecb7d8f 100644
--- a/src/tests/JIT/SIMD/VectorHWAccel_r.csproj
+++ b/src/tests/JIT/SIMD/VectorHWAccel_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorHWAccel_ro.csproj b/src/tests/JIT/SIMD/VectorHWAccel_ro.csproj
index fdcfd4a6d73f9..355039892c9d9 100644
--- a/src/tests/JIT/SIMD/VectorHWAccel_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorHWAccel_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorInit.cs b/src/tests/JIT/SIMD/VectorInit.cs
index 26984d57aaee2..77d2bd8edb8ce 100644
--- a/src/tests/JIT/SIMD/VectorInit.cs
+++ b/src/tests/JIT/SIMD/VectorInit.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -36,7 +37,8 @@ public static int VectorInit(float x)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/VectorInitN.cs b/src/tests/JIT/SIMD/VectorInitN.cs
index f59344a65f280..42630e8d2d801 100644
--- a/src/tests/JIT/SIMD/VectorInitN.cs
+++ b/src/tests/JIT/SIMD/VectorInitN.cs
@@ -5,8 +5,9 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -98,7 +99,8 @@ public static int VectorInitN(float x, float y, float z, float w)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/VectorInitN_r.csproj b/src/tests/JIT/SIMD/VectorInitN_r.csproj
index 1e405404eeee3..194cc22a6c544 100644
--- a/src/tests/JIT/SIMD/VectorInitN_r.csproj
+++ b/src/tests/JIT/SIMD/VectorInitN_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorInitN_ro.csproj b/src/tests/JIT/SIMD/VectorInitN_ro.csproj
index bc1a7db739b90..800eabfceacf4 100644
--- a/src/tests/JIT/SIMD/VectorInitN_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorInitN_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorInit_r.csproj b/src/tests/JIT/SIMD/VectorInit_r.csproj
index baa1f1c2c6f2b..66d589c978e0c 100644
--- a/src/tests/JIT/SIMD/VectorInit_r.csproj
+++ b/src/tests/JIT/SIMD/VectorInit_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorInit_ro.csproj b/src/tests/JIT/SIMD/VectorInit_ro.csproj
index 175fa41e57980..a69df515fdcc7 100644
--- a/src/tests/JIT/SIMD/VectorInit_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorInit_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorIntEquals.cs b/src/tests/JIT/SIMD/VectorIntEquals.cs
index ffbe91e9385cf..8947f6f17b21b 100644
--- a/src/tests/JIT/SIMD/VectorIntEquals.cs
+++ b/src/tests/JIT/SIMD/VectorIntEquals.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private static int VectorIntEquals()
     {
@@ -81,7 +82,8 @@ private static int VectorIntEquals()
         return Pass;
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return VectorIntEquals();
     }
diff --git a/src/tests/JIT/SIMD/VectorIntEquals_r.csproj b/src/tests/JIT/SIMD/VectorIntEquals_r.csproj
index ee3892e57efaa..55bd053cc52d5 100644
--- a/src/tests/JIT/SIMD/VectorIntEquals_r.csproj
+++ b/src/tests/JIT/SIMD/VectorIntEquals_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/VectorIntEquals_ro.csproj b/src/tests/JIT/SIMD/VectorIntEquals_ro.csproj
index aa874a90aa5fc..5601f95bd7214 100644
--- a/src/tests/JIT/SIMD/VectorIntEquals_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorIntEquals_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorMatrix.cs b/src/tests/JIT/SIMD/VectorMatrix.cs
index 96388ce6156d6..bdee396bc639e 100644
--- a/src/tests/JIT/SIMD/VectorMatrix.cs
+++ b/src/tests/JIT/SIMD/VectorMatrix.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -200,7 +201,8 @@ public static int VectorMatrix<T>(Matrix<T> left, Matrix<T> right)
         return returnVal;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/VectorMatrix_r.csproj b/src/tests/JIT/SIMD/VectorMatrix_r.csproj
index 24dee0917e3dd..37cc458b61afd 100644
--- a/src/tests/JIT/SIMD/VectorMatrix_r.csproj
+++ b/src/tests/JIT/SIMD/VectorMatrix_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorMatrix_ro.csproj b/src/tests/JIT/SIMD/VectorMatrix_ro.csproj
index 4bd8df31ee28e..42c1fc881a184 100644
--- a/src/tests/JIT/SIMD/VectorMatrix_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorMatrix_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorMax.cs b/src/tests/JIT/SIMD/VectorMax.cs
index 92c2a8347e648..18291fa71fafd 100644
--- a/src/tests/JIT/SIMD/VectorMax.cs
+++ b/src/tests/JIT/SIMD/VectorMax.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -70,7 +71,8 @@ public static int VectorMax(float left, float right, float result)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorMaxTest<float>.VectorMax(2f, 3f, 3f) != Pass) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorMax_r.csproj b/src/tests/JIT/SIMD/VectorMax_r.csproj
index 25056f18cbb6b..062495bca0329 100644
--- a/src/tests/JIT/SIMD/VectorMax_r.csproj
+++ b/src/tests/JIT/SIMD/VectorMax_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorMax_ro.csproj b/src/tests/JIT/SIMD/VectorMax_ro.csproj
index 800c0acc34989..7f1a7550ff1fa 100644
--- a/src/tests/JIT/SIMD/VectorMax_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorMax_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorMin.cs b/src/tests/JIT/SIMD/VectorMin.cs
index 80cd5e645272d..a682a8cea51a3 100644
--- a/src/tests/JIT/SIMD/VectorMin.cs
+++ b/src/tests/JIT/SIMD/VectorMin.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -70,7 +71,8 @@ public static int VectorMin(float left, float right, float result)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorMinTest<float>.VectorMin(2f, 3f, 2f) != Pass) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorMin_r.csproj b/src/tests/JIT/SIMD/VectorMin_r.csproj
index 5d004100385b5..99bd2484b8aea 100644
--- a/src/tests/JIT/SIMD/VectorMin_r.csproj
+++ b/src/tests/JIT/SIMD/VectorMin_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorMin_ro.csproj b/src/tests/JIT/SIMD/VectorMin_ro.csproj
index 59c1faeccd9bd..54c52ca9171b9 100644
--- a/src/tests/JIT/SIMD/VectorMin_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorMin_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorMul.cs b/src/tests/JIT/SIMD/VectorMul.cs
index 76b0713d1780f..7bad4029a9cde 100644
--- a/src/tests/JIT/SIMD/VectorMul.cs
+++ b/src/tests/JIT/SIMD/VectorMul.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -92,7 +93,8 @@ public static int VectorMul(float left, float right, float result)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorMulTest<float>.VectorMul(2, 3, (float)(2 * 3), (float)(2 * 3) * (2 * 3), (float)(3 * 3)) != Pass)
diff --git a/src/tests/JIT/SIMD/VectorMul_r.csproj b/src/tests/JIT/SIMD/VectorMul_r.csproj
index 5d4db88327e9e..15a0dbc16d0ae 100644
--- a/src/tests/JIT/SIMD/VectorMul_r.csproj
+++ b/src/tests/JIT/SIMD/VectorMul_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorMul_ro.csproj b/src/tests/JIT/SIMD/VectorMul_ro.csproj
index 0a2f79cb64803..8f0e1ec88275a 100644
--- a/src/tests/JIT/SIMD/VectorMul_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorMul_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorRelOp.cs b/src/tests/JIT/SIMD/VectorRelOp.cs
index 454b4e983d430..8e746f1028fe5 100644
--- a/src/tests/JIT/SIMD/VectorRelOp.cs
+++ b/src/tests/JIT/SIMD/VectorRelOp.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -141,7 +142,8 @@ public static int VectorRelOp(T larger, T smaller)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorRelopTest<float>.VectorRelOp(3, 2) != Pass) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorRelOp_r.csproj b/src/tests/JIT/SIMD/VectorRelOp_r.csproj
index b5ad275d28794..47d5057059e64 100644
--- a/src/tests/JIT/SIMD/VectorRelOp_r.csproj
+++ b/src/tests/JIT/SIMD/VectorRelOp_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorRelOp_ro.csproj b/src/tests/JIT/SIMD/VectorRelOp_ro.csproj
index da0c138839662..78513bed475ae 100644
--- a/src/tests/JIT/SIMD/VectorRelOp_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorRelOp_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorReturn.cs b/src/tests/JIT/SIMD/VectorReturn.cs
index 2530b816a0cc5..a92f56346c2f9 100644
--- a/src/tests/JIT/SIMD/VectorReturn.cs
+++ b/src/tests/JIT/SIMD/VectorReturn.cs
@@ -5,8 +5,9 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -38,7 +39,7 @@ string seedStr when int.TryParse(seedStr, out int envSeed) => envSeed,
     };
 
     [MethodImplAttribute(MethodImplOptions.NoInlining)]
-    public static void init()
+    internal static void init()
     {
         Random random = new Random(Seed);
 
@@ -221,7 +222,8 @@ public static int Vector3ReturnTest()
         return Pass;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         init();
 
diff --git a/src/tests/JIT/SIMD/VectorReturn_r.csproj b/src/tests/JIT/SIMD/VectorReturn_r.csproj
index ee03bdfa31ba6..973865c5b2d48 100644
--- a/src/tests/JIT/SIMD/VectorReturn_r.csproj
+++ b/src/tests/JIT/SIMD/VectorReturn_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorReturn_ro.csproj b/src/tests/JIT/SIMD/VectorReturn_ro.csproj
index 0d8e171aa5096..7acbae3cc6f55 100644
--- a/src/tests/JIT/SIMD/VectorReturn_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorReturn_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorSet.cs b/src/tests/JIT/SIMD/VectorSet.cs
index 733b0dbf3b7b5..0231d7a80f839 100644
--- a/src/tests/JIT/SIMD/VectorSet.cs
+++ b/src/tests/JIT/SIMD/VectorSet.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -71,7 +72,8 @@ public static int VectorSet(float value)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorSetTest.VectorSet(3.14f) == Fail) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorSet_r.csproj b/src/tests/JIT/SIMD/VectorSet_r.csproj
index 264e976283311..bb0b5dbe7c5a6 100644
--- a/src/tests/JIT/SIMD/VectorSet_r.csproj
+++ b/src/tests/JIT/SIMD/VectorSet_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorSet_ro.csproj b/src/tests/JIT/SIMD/VectorSet_ro.csproj
index a86d5c7e0b52b..e6c8264cccfb6 100644
--- a/src/tests/JIT/SIMD/VectorSet_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorSet_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorSqrt.cs b/src/tests/JIT/SIMD/VectorSqrt.cs
index 143e9855eebf3..f9a013d167a43 100644
--- a/src/tests/JIT/SIMD/VectorSqrt.cs
+++ b/src/tests/JIT/SIMD/VectorSqrt.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -32,7 +33,8 @@ public static int VectorSqrt(T square, T root, T allowableError)
     }
 
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorSqrtTest<float>.VectorSqrt(25f, 5f, 1E-06f) != Pass)
diff --git a/src/tests/JIT/SIMD/VectorSqrt_r.csproj b/src/tests/JIT/SIMD/VectorSqrt_r.csproj
index 07601f438607b..cce97b73fa141 100644
--- a/src/tests/JIT/SIMD/VectorSqrt_r.csproj
+++ b/src/tests/JIT/SIMD/VectorSqrt_r.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/tests/JIT/SIMD/VectorSqrt_ro.csproj b/src/tests/JIT/SIMD/VectorSqrt_ro.csproj
index bfe235903b558..9410458e23b7a 100644
--- a/src/tests/JIT/SIMD/VectorSqrt_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorSqrt_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorSub.cs b/src/tests/JIT/SIMD/VectorSub.cs
index e4c7518f3c8db..4369883caa47f 100644
--- a/src/tests/JIT/SIMD/VectorSub.cs
+++ b/src/tests/JIT/SIMD/VectorSub.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -66,7 +67,8 @@ public static int VectorSub()
             return Pass;
         }
     }
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
         if (VectorSubTest<float>.VectorSub(3, 2, (float)(3 - 2)) != Pass) returnVal = Fail;
diff --git a/src/tests/JIT/SIMD/VectorSub_r.csproj b/src/tests/JIT/SIMD/VectorSub_r.csproj
index 8fe00ef0e9f4f..176b5367279b4 100644
--- a/src/tests/JIT/SIMD/VectorSub_r.csproj
+++ b/src/tests/JIT/SIMD/VectorSub_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorSub_ro.csproj b/src/tests/JIT/SIMD/VectorSub_ro.csproj
index d68b58ea75dcf..275aca7466567 100644
--- a/src/tests/JIT/SIMD/VectorSub_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorSub_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorSum.cs b/src/tests/JIT/SIMD/VectorSum.cs
index 0a6bf6796a0ac..9930acbd774c9 100644
--- a/src/tests/JIT/SIMD/VectorSum.cs
+++ b/src/tests/JIT/SIMD/VectorSum.cs
@@ -6,8 +6,9 @@
 using System.Numerics;
 using System.Runtime.Intrinsics.Arm;
 using System.Runtime.Intrinsics.X86;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -27,7 +28,8 @@ public static int VectorSum(T a, T b)
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/VectorSum_r.csproj b/src/tests/JIT/SIMD/VectorSum_r.csproj
index 56a3fade41a3b..db41de4009246 100644
--- a/src/tests/JIT/SIMD/VectorSum_r.csproj
+++ b/src/tests/JIT/SIMD/VectorSum_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorSum_ro.csproj b/src/tests/JIT/SIMD/VectorSum_ro.csproj
index 3a4794cd56acd..26bb98439048b 100644
--- a/src/tests/JIT/SIMD/VectorSum_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorSum_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorUnused.cs b/src/tests/JIT/SIMD/VectorUnused.cs
index 631d48216b8fa..bb6050d0ac932 100644
--- a/src/tests/JIT/SIMD/VectorUnused.cs
+++ b/src/tests/JIT/SIMD/VectorUnused.cs
@@ -9,8 +9,9 @@
 
 using System;
 using System.Numerics;
+using Xunit;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     private const int Pass = 100;
     private const int Fail = -1;
@@ -61,7 +62,8 @@ public static int VectorUnused()
         }
     }
 
-    private static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int returnVal = Pass;
 
diff --git a/src/tests/JIT/SIMD/VectorUnused_r.csproj b/src/tests/JIT/SIMD/VectorUnused_r.csproj
index 34274d5c59048..bad7dba933740 100644
--- a/src/tests/JIT/SIMD/VectorUnused_r.csproj
+++ b/src/tests/JIT/SIMD/VectorUnused_r.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize />
diff --git a/src/tests/JIT/SIMD/VectorUnused_ro.csproj b/src/tests/JIT/SIMD/VectorUnused_ro.csproj
index dca713e275dc3..7efbb4ef7ba51 100644
--- a/src/tests/JIT/SIMD/VectorUnused_ro.csproj
+++ b/src/tests/JIT/SIMD/VectorUnused_ro.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/tests/JIT/SIMD/VectorUtil.cs b/src/tests/JIT/SIMD/VectorUtil.cs
index 9824d255f08ab..3bb341714372d 100644
--- a/src/tests/JIT/SIMD/VectorUtil.cs
+++ b/src/tests/JIT/SIMD/VectorUtil.cs
@@ -6,7 +6,7 @@
 using System.Numerics;
 using System.IO;
 
-internal partial class VectorTest
+public partial class VectorTest
 {
     public static bool CheckValue<T>(T value, T expectedValue)
     {