diff --git a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor
index 6993a5e400..80f8521de7 100644
--- a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor
@@ -7,18 +7,12 @@
 
 <div id="duplicate-on-element-override">
     <DuplicateAttributesOnElementChildComponent
-        BoolAttributeBefore="true"
-        StringAttributeBefore="original-text"
         UnmatchedValues="@elementValues"
         BoolAttributeAfter="false"
         StringAttributeAfter="other-text" />
 </div>
 
 @functions {
-    void SomeMethod()
-    {
-    }
-
     Dictionary<string, object> elementValues = new Dictionary<string, object>()
     {
         { "bool",  true },
diff --git a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.cs b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.cs
deleted file mode 100644
index 055ecf7149..0000000000
--- a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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 System.Collections.Generic;
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
-
-namespace BasicTestApp
-{
-    // Written in C# for flexibility and because we don't currently have the ability to write this in .razor.
-    public class DuplicateAttributesOnElementChildComponent : ComponentBase
-    {
-        [Parameter] public string StringAttributeBefore { get; private set; }
-        [Parameter] public bool BoolAttributeBefore { get; private set; }
-        [Parameter] public string StringAttributeAfter { get; private set; }
-        [Parameter] public bool? BoolAttributeAfter { get; private set; }
-
-        [Parameter(CaptureUnmatchedValues = true)] public Dictionary<string, object> UnmatchedValues { get; private set; }
-
-        protected override void BuildRenderTree(RenderTreeBuilder builder)
-        {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "string", StringAttributeBefore);
-            builder.AddAttribute(2, "bool", BoolAttributeBefore);
-            builder.AddMultipleAttributes(3, UnmatchedValues);
-            if (StringAttributeAfter != null)
-            {
-                builder.AddAttribute(4, "string", StringAttributeAfter);
-            }
-            if (BoolAttributeAfter != null)
-            {
-                builder.AddAttribute(5, "bool", BoolAttributeAfter);
-            }
-            builder.CloseElement();
-        }
-    }
-}
diff --git a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.razor b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.razor
new file mode 100644
index 0000000000..27048982f1
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.razor
@@ -0,0 +1,23 @@
+@if (StringAttributeBefore != null)
+{
+    <div string="@StringAttributeBefore"
+         bool="@BoolAttributeBefore"
+         @attributes="@UnmatchedValues">
+    </div>
+}
+else
+{
+    <div @attributes="@UnmatchedValues"
+         string="@StringAttributeAfter"
+         bool="@BoolAttributeAfter">
+    </div>
+}
+
+@code {
+    [Parameter] public string StringAttributeBefore { get; private set; }
+    [Parameter] public bool BoolAttributeBefore { get; private set; }
+    [Parameter] public string StringAttributeAfter { get; private set; }
+    [Parameter] public bool? BoolAttributeAfter { get; private set; }
+
+    [Parameter(CaptureUnmatchedValues = true)] public Dictionary<string, object> UnmatchedValues { get; private set; }
+}