diff --git a/test/Templates.Test/SpaTemplateTest/AngularTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/AngularTemplateTest.cs
new file mode 100644
index 0000000000..ca0693f36b
--- /dev/null
+++ b/test/Templates.Test/SpaTemplateTest/AngularTemplateTest.cs
@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Templates.Test.SpaTemplateTest
+{
+    public class AngularTemplateTest : SpaTemplateTestBase
+    {
+        public AngularTemplateTest(ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
+        // Just use 'angular' as representative for .NET 4.6.1 coverage, as
+        // the client-side code isn't affected by the .NET runtime choice
+        public void AngularTemplate_Works_NetFramework()
+            => SpaTemplateImpl("net461", "angular");
+
+        [Fact]
+        public void AngularTemplate_Works_NetCore()
+            => SpaTemplateImpl(null, "angular");
+    }
+}
diff --git a/test/Templates.Test/SpaTemplateTest/AureliaTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/AureliaTemplateTest.cs
new file mode 100644
index 0000000000..b6ca2373cd
--- /dev/null
+++ b/test/Templates.Test/SpaTemplateTest/AureliaTemplateTest.cs
@@ -0,0 +1,16 @@
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Templates.Test.SpaTemplateTest
+{
+    public class AureliaTemplateTest : SpaTemplateTestBase
+    {
+        public AureliaTemplateTest(ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [Fact]
+        public void AureliaTemplate_Works_NetCore()
+            => SpaTemplateImpl(null, "aurelia");
+    }
+}
diff --git a/test/Templates.Test/SpaTemplateTest/KnockoutTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/KnockoutTemplateTest.cs
new file mode 100644
index 0000000000..b0db4427dd
--- /dev/null
+++ b/test/Templates.Test/SpaTemplateTest/KnockoutTemplateTest.cs
@@ -0,0 +1,16 @@
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Templates.Test.SpaTemplateTest
+{
+    public class KnockoutTemplateTest : SpaTemplateTestBase
+    {
+        public KnockoutTemplateTest(ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [Fact]
+        public void KnockoutTemplate_Works_NetCore()
+            => SpaTemplateImpl(null, "knockout");
+    }
+}
diff --git a/test/Templates.Test/SpaTemplateTest/ReactReduxTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/ReactReduxTemplateTest.cs
new file mode 100644
index 0000000000..919a76baf3
--- /dev/null
+++ b/test/Templates.Test/SpaTemplateTest/ReactReduxTemplateTest.cs
@@ -0,0 +1,16 @@
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Templates.Test.SpaTemplateTest
+{
+    public class ReactReduxTemplateTest : SpaTemplateTestBase
+    {
+        public ReactReduxTemplateTest(ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [Fact]
+        public void ReactReduxTemplate_Works_NetCore()
+            => SpaTemplateImpl(null, "reactredux");
+    }
+}
diff --git a/test/Templates.Test/SpaTemplateTest/ReactTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/ReactTemplateTest.cs
new file mode 100644
index 0000000000..7238b4930c
--- /dev/null
+++ b/test/Templates.Test/SpaTemplateTest/ReactTemplateTest.cs
@@ -0,0 +1,16 @@
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Templates.Test.SpaTemplateTest
+{
+    public class ReactTemplateTest : SpaTemplateTestBase
+    {
+        public ReactTemplateTest(ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [Fact]
+        public void ReactTemplate_Works_NetCore()
+            => SpaTemplateImpl(null, "react");
+    }
+}
diff --git a/test/Templates.Test/SpaTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/SpaTemplateTestBase.cs
similarity index 71%
rename from test/Templates.Test/SpaTemplateTest.cs
rename to test/Templates.Test/SpaTemplateTest/SpaTemplateTestBase.cs
index 3b98fa6479..eb9fa7070a 100644
--- a/test/Templates.Test/SpaTemplateTest.cs
+++ b/test/Templates.Test/SpaTemplateTest/SpaTemplateTestBase.cs
@@ -1,40 +1,24 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Testing.xunit;
 using OpenQA.Selenium;
 using System.Net;
 using Templates.Test.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Templates.Test
+namespace Templates.Test.SpaTemplateTest
 {
-    public class SpaTemplateTest : TemplateTestBase
+    public class SpaTemplateTestBase : TemplateTestBase
     {
-        public SpaTemplateTest(ITestOutputHelper output) : base(output)
+        public SpaTemplateTestBase(ITestOutputHelper output) : base(output)
         {
         }
 
-        [ConditionalTheory]
-        [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
-        // Just use 'angular' as representative for .NET 4.6.1 coverage, as
-        // the client-side code isn't affected by the .NET runtime choice
-        [InlineData("angular")]
-        public void SpaTemplate_Works_NetFramework(string template)
-            => SpaTemplateImpl("net461", template);
-
-        [Theory]
-        [InlineData("angular")]
-        [InlineData("react")]
-        [InlineData("reactredux")]
-        [InlineData("aurelia")]
-        [InlineData("knockout")]
-        [InlineData("vue")]
-        public void SpaTemplate_Works_NetCore(string template)
-            => SpaTemplateImpl(null, template);
-
-        private void SpaTemplateImpl(string targetFrameworkOverride, string template)
+        // Rather than using [Theory] to pass each of the different values for 'template',
+        // it's important to distribute the SPA template tests over different test classes
+        // so they can be run in parallel. Xunit doesn't parallelize within a test class.
+        protected void SpaTemplateImpl(string targetFrameworkOverride, string template)
         {
             RunDotNetNew(template, targetFrameworkOverride);
             RunNpmInstall();
diff --git a/test/Templates.Test/SpaTemplateTest/VueTemplateTest.cs b/test/Templates.Test/SpaTemplateTest/VueTemplateTest.cs
new file mode 100644
index 0000000000..cb3a7e63aa
--- /dev/null
+++ b/test/Templates.Test/SpaTemplateTest/VueTemplateTest.cs
@@ -0,0 +1,16 @@
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Templates.Test.SpaTemplateTest
+{
+    public class VueTemplateTest : SpaTemplateTestBase
+    {
+        public VueTemplateTest(ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [Fact]
+        public void VueTemplate_Works_NetCore()
+            => SpaTemplateImpl(null, "vue");
+    }
+}