diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/generated/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.Mvid.IndividualTests.g.cs b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/generated/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.Mvid.IndividualTests.g.cs
new file mode 100644
index 00000000000000..a377f9e0ebc383
--- /dev/null
+++ b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/generated/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.Mvid.IndividualTests.g.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace ILLink.RoslynAnalyzer.Tests.CommandLine.Mvid
+{
+    public sealed partial class IndividualTests : LinkerTestBase
+    {
+
+        protected override string TestSuiteName => "CommandLine.Mvid.Individual";
+
+        [Fact]
+        public Task DeterministicMvidWorks()
+        {
+            return RunTest(allowMissingWarnings: true);
+        }
+
+        [Fact]
+        public Task NewMvidWorks()
+        {
+            return RunTest(allowMissingWarnings: true);
+        }
+
+        [Fact]
+        public Task RetainMvid()
+        {
+            return RunTest(allowMissingWarnings: true);
+        }
+
+    }
+}
diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/generated/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.MvidTests.g.cs b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/generated/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.MvidTests.g.cs
index 2b5dfbefe86d09..11f4d15ae3fb00 100644
--- a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/generated/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.MvidTests.g.cs
+++ b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/generated/ILLink.RoslynAnalyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.MvidTests.g.cs
@@ -15,23 +15,5 @@ public Task DefaultMvidBehavior()
             return RunTest(allowMissingWarnings: true);
         }
 
-        [Fact]
-        public Task DeterministicMvidWorks()
-        {
-            return RunTest(allowMissingWarnings: true);
-        }
-
-        [Fact]
-        public Task NewMvidWorks()
-        {
-            return RunTest(allowMissingWarnings: true);
-        }
-
-        [Fact]
-        public Task RetainMvid()
-        {
-            return RunTest(allowMissingWarnings: true);
-        }
-
     }
 }
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/DeterministicMvidWorks.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/DeterministicMvidWorks.cs
similarity index 85%
rename from src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/DeterministicMvidWorks.cs
rename to src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/DeterministicMvidWorks.cs
index ff6f678b5aa27b..0a44a3caee10ac 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/DeterministicMvidWorks.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/DeterministicMvidWorks.cs
@@ -1,7 +1,7 @@
 using Mono.Linker.Tests.Cases.Expectations.Assertions;
 using Mono.Linker.Tests.Cases.Expectations.Metadata;
 
-namespace Mono.Linker.Tests.Cases.CommandLine.Mvid
+namespace Mono.Linker.Tests.Cases.CommandLine.Mvid.Individual
 {
     [SetupLinkerArgument("--deterministic", "true")]
     public class DeterministicMvidWorks
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/NewMvidWorks.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/NewMvidWorks.cs
similarity index 84%
rename from src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/NewMvidWorks.cs
rename to src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/NewMvidWorks.cs
index ed0049e7005339..59b44cdfc7c344 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/NewMvidWorks.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/NewMvidWorks.cs
@@ -1,7 +1,7 @@
 using Mono.Linker.Tests.Cases.Expectations.Assertions;
 using Mono.Linker.Tests.Cases.Expectations.Metadata;
 
-namespace Mono.Linker.Tests.Cases.CommandLine.Mvid
+namespace Mono.Linker.Tests.Cases.CommandLine.Mvid.Individual
 {
     [SetupLinkerArgument("--new-mvid", "true")]
     public class NewMvidWorks
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/RetainMvid.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/RetainMvid.cs
similarity index 84%
rename from src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/RetainMvid.cs
rename to src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/RetainMvid.cs
index a78c8dc9ae6629..36d09393cdfc48 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/RetainMvid.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/CommandLine/Mvid/Individual/RetainMvid.cs
@@ -1,7 +1,7 @@
 using Mono.Linker.Tests.Cases.Expectations.Assertions;
 using Mono.Linker.Tests.Cases.Expectations.Metadata;
 
-namespace Mono.Linker.Tests.Cases.CommandLine.Mvid
+namespace Mono.Linker.Tests.Cases.CommandLine.Mvid.Individual
 {
     [SetupLinkerArgument("--new-mvid", "false")]
     public class RetainMvid
diff --git a/src/tools/illink/test/Mono.Linker.Tests/TestCases/IndividualTests.cs b/src/tools/illink/test/Mono.Linker.Tests/TestCases/IndividualTests.cs
index e919363365a279..7ab1fb7522446e 100644
--- a/src/tools/illink/test/Mono.Linker.Tests/TestCases/IndividualTests.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests/TestCases/IndividualTests.cs
@@ -9,6 +9,7 @@
 using System.Xml;
 using Mono.Cecil;
 using Mono.Linker.Tests.Cases.CommandLine.Mvid;
+using Mono.Linker.Tests.Cases.CommandLine.Mvid.Individual;
 using Mono.Linker.Tests.Cases.Interop.PInvoke.Individual;
 using Mono.Linker.Tests.Cases.References.Individual;
 using Mono.Linker.Tests.Cases.Tracing.Individual;
@@ -199,6 +200,7 @@ public void DeterministicMvidWorks()
         {
             var testCase = CreateIndividualCase(typeof(DeterministicMvidWorks));
             var result = Run(testCase, out TestRunner runner);
+            Check(result);
 
             var originalMvid = GetMvid(result.InputAssemblyPath);
             var firstOutputMvid = GetMvid(result.OutputAssemblyPath);
@@ -217,6 +219,7 @@ public void NewMvidWorks()
         {
             var testCase = CreateIndividualCase(typeof(NewMvidWorks));
             var result = Run(testCase, out TestRunner runner);
+            Check(result);
 
             var originalMvid = GetMvid(result.InputAssemblyPath);
             var firstOutputMvid = GetMvid(result.OutputAssemblyPath);
@@ -234,6 +237,7 @@ public void RetainMvidWorks()
         {
             var testCase = CreateIndividualCase(typeof(RetainMvid));
             var result = Run(testCase, out TestRunner runner);
+            Check(result);
 
             var originalMvid = GetMvid(result.InputAssemblyPath);
             var firstOutputMvid = GetMvid(result.OutputAssemblyPath);
@@ -269,5 +273,10 @@ protected virtual TrimmedTestCaseResult Run(TestCase testCase, out TestRunner ru
             runner = new TestRunner(new ObjectFactory());
             return runner.Run(testCase);
         }
+
+        protected virtual void Check(TrimmedTestCaseResult linkedResult)
+        {
+            new ResultChecker().Check(linkedResult);
+        }
     }
 }