diff --git a/test/testapps/BasicTestApp/AddRemoveChildComponents.cshtml b/test/testapps/BasicTestApp/AddRemoveChildComponents.cshtml
index 0f82b31c41..33b34f3629 100644
--- a/test/testapps/BasicTestApp/AddRemoveChildComponents.cshtml
+++ b/test/testapps/BasicTestApp/AddRemoveChildComponents.cshtml
@@ -5,7 +5,7 @@ Child components follow.
 
 @foreach (var message in currentChildrenMessages)
 {
-    <p><c:MessageComponent Message=@message /></p>
+    <p><MessageComponent Message=@message /></p>
 }
 
 @functions {
diff --git a/test/testapps/BasicTestApp/BasicTestApp.csproj b/test/testapps/BasicTestApp/BasicTestApp.csproj
index 29f3ca09f8..6508ed5299 100644
--- a/test/testapps/BasicTestApp/BasicTestApp.csproj
+++ b/test/testapps/BasicTestApp/BasicTestApp.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Razor/2.1.0-preview2-30230;Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
 
     <!-- Local alternative to <RunArguments>blazor serve</RunArguments> -->
     <RunCommand>dotnet</RunCommand>
-    <RunArguments>run --project ..\..\..\src\Microsoft.AspNetCore.Blazor.Cli serve --pathbase /subdir</RunArguments>
+    <RunArguments>run --project ../../../src/Microsoft.AspNetCore.Blazor.Cli serve --pathbase /subdir</RunArguments>
   </PropertyGroup>
 
   <!-- Local alternative to <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" /> -->
diff --git a/test/testapps/BasicTestApp/CounterComponentUsingChild.cshtml b/test/testapps/BasicTestApp/CounterComponentUsingChild.cshtml
index f548a08f35..4e7bb331ba 100644
--- a/test/testapps/BasicTestApp/CounterComponentUsingChild.cshtml
+++ b/test/testapps/BasicTestApp/CounterComponentUsingChild.cshtml
@@ -1,5 +1,5 @@
 <h1>Counter</h1>
-<p>Current count: <c:MessageComponent Message="@currentCount.ToString()" /></p>
+<p>Current count: <MessageComponent Message=@currentCount.ToString() /></p>
 <button @onclick(IncrementCount)>Click me</button>
 
 @functions {
diff --git a/test/testapps/BasicTestApp/CounterComponentWrapper.cshtml b/test/testapps/BasicTestApp/CounterComponentWrapper.cshtml
index 6501270836..5b957df6a4 100644
--- a/test/testapps/BasicTestApp/CounterComponentWrapper.cshtml
+++ b/test/testapps/BasicTestApp/CounterComponentWrapper.cshtml
@@ -2,6 +2,6 @@
 
 This is the parent component. Here comes the counter:
 
-<c:CounterComponent />
+<CounterComponent />
 
 Finished.
diff --git a/test/testapps/BasicTestApp/ParentChildComponent.cshtml b/test/testapps/BasicTestApp/ParentChildComponent.cshtml
index 0577adfe19..a9d6823b15 100644
--- a/test/testapps/BasicTestApp/ParentChildComponent.cshtml
+++ b/test/testapps/BasicTestApp/ParentChildComponent.cshtml
@@ -1,4 +1,4 @@
 <fieldset>
     <legend>Parent component</legend>
-    <c:RedTextComponent />
+    <RedTextComponent />
 </fieldset>
diff --git a/test/testapps/BasicTestApp/PropertiesChangedHandlerParent.cshtml b/test/testapps/BasicTestApp/PropertiesChangedHandlerParent.cshtml
index 89137bf9cf..da7568ec21 100644
--- a/test/testapps/BasicTestApp/PropertiesChangedHandlerParent.cshtml
+++ b/test/testapps/BasicTestApp/PropertiesChangedHandlerParent.cshtml
@@ -1,4 +1,4 @@
-<c:PropertiesChangedHandlerChild SuppliedValue="@valueToSupply" />
+<PropertiesChangedHandlerChild SuppliedValue=@valueToSupply />
 <button onclick=@{ valueToSupply++; }>Increment</button>
 
 @functions {
diff --git a/test/testapps/BasicTestApp/RouterTest/Default.cshtml b/test/testapps/BasicTestApp/RouterTest/Default.cshtml
index 20b87b9c00..fb8b327e4d 100644
--- a/test/testapps/BasicTestApp/RouterTest/Default.cshtml
+++ b/test/testapps/BasicTestApp/RouterTest/Default.cshtml
@@ -1,3 +1,3 @@
 @using BasicTestApp.RouterTest
 <div id="test-info">This is the default page.</div>
-<c:Links />
+<Links />
diff --git a/test/testapps/BasicTestApp/RouterTest/Other.cshtml b/test/testapps/BasicTestApp/RouterTest/Other.cshtml
index c3b66c3033..72a79a1cd0 100644
--- a/test/testapps/BasicTestApp/RouterTest/Other.cshtml
+++ b/test/testapps/BasicTestApp/RouterTest/Other.cshtml
@@ -1,3 +1,3 @@
 @using BasicTestApp.RouterTest
 <div id="test-info">This is another page.</div>
-<c:Links />
+<Links />
diff --git a/test/testapps/BasicTestApp/RouterTest/TestRouter.cshtml b/test/testapps/BasicTestApp/RouterTest/TestRouter.cshtml
index 7f16328038..d3c34ffcd4 100644
--- a/test/testapps/BasicTestApp/RouterTest/TestRouter.cshtml
+++ b/test/testapps/BasicTestApp/RouterTest/TestRouter.cshtml
@@ -1,4 +1,4 @@
 @using Microsoft.AspNetCore.Blazor.Routing
-<c:Router AppAssembly=@(typeof(BasicTestApp.Program).Assembly)
-          PagesNamespace=@nameof(BasicTestApp)
-          DefaultComponentName=@("Default") />
+<Router AppAssembly=typeof(BasicTestApp.Program).Assembly
+        PagesNamespace=@nameof(BasicTestApp)
+        DefaultComponentName="Default" />