diff --git a/BTCPayServer.Tests/U2FTests.cs b/BTCPayServer.Tests/U2FTests.cs
index 4f3b25efc..1241b0a11 100644
--- a/BTCPayServer.Tests/U2FTests.cs
+++ b/BTCPayServer.Tests/U2FTests.cs
@@ -57,7 +57,7 @@ namespace BTCPayServer.Tests
                     .IsType<ViewResult>(manageController.AddU2FDevice("testdevice")).Model);
 
                 Assert.NotEmpty(addDeviceVM.Challenge);
-                Assert.Equal(addDeviceVM.Name, "testdevice");
+                Assert.Equal("testdevice", addDeviceVM.Name);
                 Assert.NotEmpty(addDeviceVM.Version);
                 Assert.Null(addDeviceVM.DeviceResponse);
 
diff --git a/BTCPayServer/DerivationSchemeParser.cs b/BTCPayServer/DerivationSchemeParser.cs
index f6ca91338..16797513b 100644
--- a/BTCPayServer/DerivationSchemeParser.cs
+++ b/BTCPayServer/DerivationSchemeParser.cs
@@ -79,7 +79,10 @@ namespace BTCPayServer
             }
 
             if (!Network.Consensus.SupportSegwit)
+            {
                 hintedLabels.Add("legacy");
+                str = str.Replace("-[p2sh]", string.Empty, StringComparison.OrdinalIgnoreCase);
+            }
 
             try
             {
diff --git a/btcpayserver.sln b/btcpayserver.sln
index 8f134c67a..72fc1a167 100644
--- a/btcpayserver.sln
+++ b/btcpayserver.sln
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{29290EC7-0
 		Build\Common.csproj = Build\Common.csproj
 		.circleci\config.yml = .circleci\config.yml
 		docker-entrypoint.sh = docker-entrypoint.sh
+		.circleci\run-tests.sh = .circleci\run-tests.sh
 		Build\Version.csproj = Build\Version.csproj
 	EndProjectSection
 EndProject