diff --git a/src/bunit.web.query/Labels/LabelQueryConstants.cs b/src/bunit.web.query/Labels/LabelQueryConstants.cs
new file mode 100644
index 000000000..f9b144697
--- /dev/null
+++ b/src/bunit.web.query/Labels/LabelQueryConstants.cs
@@ -0,0 +1,15 @@
+namespace Bunit;
+
+internal class LabelQueryConstants
+{
+	internal static readonly List<string> HtmlElementsThatCanHaveALabel = new()
+	{
+		"input",
+		"select",
+		"textarea",
+		"button",
+		"meter",
+		"output",
+		"progress",
+	};
+}
diff --git a/src/bunit.web.query/Labels/Strategies/LabelTextUsingWrappedElementStrategy.cs b/src/bunit.web.query/Labels/Strategies/LabelTextUsingWrappedElementStrategy.cs
index 3b10f0a91..c27a319be 100644
--- a/src/bunit.web.query/Labels/Strategies/LabelTextUsingWrappedElementStrategy.cs
+++ b/src/bunit.web.query/Labels/Strategies/LabelTextUsingWrappedElementStrategy.cs
@@ -11,6 +11,6 @@ internal class LabelTextUsingWrappedElementStrategy : ILabelTextQueryStrategy
 
 		return matchingLabel?
 			.Children
-			.SingleOrDefault(n => n.NodeName == "INPUT");
+			.SingleOrDefault(n => LabelQueryConstants.HtmlElementsThatCanHaveALabel.Contains(n.NodeName, StringComparer.OrdinalIgnoreCase));
 	}
 }
diff --git a/tests/bunit.testassets/BlazorE2E/LabelQueryComponent.razor b/tests/bunit.testassets/BlazorE2E/LabelQueryComponent.razor
index a57bd52b3..b9a2fbdc8 100644
--- a/tests/bunit.testassets/BlazorE2E/LabelQueryComponent.razor
+++ b/tests/bunit.testassets/BlazorE2E/LabelQueryComponent.razor
@@ -10,9 +10,12 @@
 <input id="ignored-input"/>
 
 @* Testing wrapped label *@
-<label>Wrapped Label
-	<input id="wrapped-label"/>
-</label>
+@foreach (var htmlElement in htmlElementsThatCanHaveALabel)
+{
+	<label>@htmlElement Wrapped Label
+		@((MarkupString) $"""<{htmlElement} id="{htmlElement}-wrapped-label"></{htmlElement}>""")
+	</label>
+}
 
 @* Testing no input *@
 <label>Label With Missing Input</label>
diff --git a/tests/bunit.web.query.tests/Labels/LabelQueryExtensionsTests.cs b/tests/bunit.web.query.tests/Labels/LabelQueryExtensionsTests.cs
index 0f220bca3..db19bea33 100644
--- a/tests/bunit.web.query.tests/Labels/LabelQueryExtensionsTests.cs
+++ b/tests/bunit.web.query.tests/Labels/LabelQueryExtensionsTests.cs
@@ -38,15 +38,17 @@ public void Test002()
 			.CssSelector.ShouldBe(expectedLabelText);
 	}
 
-	[Fact(DisplayName = "Should return back input associated with label when label when is wrapped around input")]
-	public void Test003()
+	[Theory(DisplayName = "Should return back input associated with label when label when is wrapped around input")]
+	[MemberData(nameof(HtmlElementsThatCanHaveALabel))]
+	public void Test003(string htmlElementWithLabel)
 	{
 		var cut = RenderComponent<LabelQueryComponent>();
 
-		var input = cut.FindByLabelText("Wrapped Label");
+		var input = cut.FindByLabelText($"{htmlElementWithLabel} Wrapped Label");
 
 		input.ShouldNotBeNull();
-		input.Id.ShouldBe("wrapped-label");
+		input.NodeName.ShouldBe(htmlElementWithLabel, StringCompareShould.IgnoreCase);
+		input.Id.ShouldBe($"{htmlElementWithLabel}-wrapped-label");
 	}
 
 	[Fact(DisplayName = "Should throw exception when label text exists but is not tied to any input")]