diff --git a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
index b1ea8198b..3348540e8 100644
--- a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
+++ b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
@@ -408,23 +408,21 @@ namespace BTCPayServer.Tests
             }
             await s.Page.WaitForSelectorAsync("#RefundForm");
 
-            var content = await s.Page.ContentAsync();
-            Assert.Contains("5,500.00 USD", content); // Should propose reimburse in fiat
-            Assert.Contains("1.10000000 BTC", content); // Should propose reimburse in BTC at the rate of before
-            Assert.Contains("2.20000000 BTC", content); // Should propose reimburse in BTC at the current rate
+            Assert.Equal("5,500.00 USD", await s.Page.TextContentAsync("label[for='FiatOption']"));
+            Assert.Equal("1.10000000 BTC", await s.Page.TextContentAsync("label[for='RateThenOption']"));
+            Assert.Equal("2.20000000 BTC", await s.Page.TextContentAsync("label[for='CurrentRateOption']"));
 
             await s.Page.ClickAsync("#" + rateSelection);
             await s.Page.ClickAsync("#ok");
 
-            await s.Page.WaitForSelectorAsync("#Destination");
-            content = await s.Page.ContentAsync();
+            var limit = await s.Page.Locator("#claimLimit").TextContentAsync();
             Assert.Contains("pull-payments", s.Page.Url);
             if (rateSelection == "FiatOption")
-                Assert.Contains("5,500.00 USD", content);
+                Assert.Equal("5,500.00 USD", limit);
             if (rateSelection == "CurrentOption")
-                Assert.Contains("2.20000000 BTC", content);
+                Assert.Equal("2.20000000 BTC", limit);
             if (rateSelection == "RateThenOption")
-                Assert.Contains("1.10000000 BTC", content);
+                Assert.Equal("1.10000000 BTC", limit);
 
             await s.GoToInvoice(invoice.Id);
             await s.Page.ClickAsync("#IssueRefund");
diff --git a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
index b553f0fbc..f5b88ec3f 100644
--- a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
+++ b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
@@ -142,7 +142,7 @@
                                     <dd class="order-1 order-sm-2 mb-1" text-translate="true">Already claimed</dd>
                                 </div>
                                 <div class="d-flex d-print-inline-block flex-column mb-0 d-sm-inline-flex float-sm-end">
-                                    <dt class="h4 text-sm-end fw-semibold text-nowrap order-2 order-sm-1 mb-1">@DisplayFormatter.Currency(Model.Amount, Model.Currency)</dt>
+                                    <dt class="h4 text-sm-end fw-semibold text-nowrap order-2 order-sm-1 mb-1" id="claimLimit">@DisplayFormatter.Currency(Model.Amount, Model.Currency)</dt>
                                     <dd class="text-sm-end order-1 order-sm-2 mb-1" text-translate="true">Claim limit</dd>
                                 </div>
                             </dl>