diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6e10c0fbf..3f4842771 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,7 @@ jobs:
             cd BTCPayServer.Tests
             dotnet test --filter Fast=Fast
             docker-compose up -d dev
-            dotnet test --filter Reliable=Reliable
-            dotnet test --filter Unreliable=Unreliable
+            dotnet test --filter Integration=Integration
 workflows:
   version: 2
   build_and_test:
diff --git a/BTCPayServer.Tests/ChangellyTests.cs b/BTCPayServer.Tests/ChangellyTests.cs
index 7f51b4437..cbbb0c3e7 100644
--- a/BTCPayServer.Tests/ChangellyTests.cs
+++ b/BTCPayServer.Tests/ChangellyTests.cs
@@ -28,7 +28,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public async void CanSetChangellyPaymentMethod()
         {
             using (var tester = ServerTester.Create())
@@ -69,7 +69,7 @@ namespace BTCPayServer.Tests
 
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public async void CanToggleChangellyPaymentMethod()
         {
             using (var tester = ServerTester.Create())
@@ -107,7 +107,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public async void CannotUseChangellyApiWithoutChangellyPaymentMethodSet()
         {
             using (var tester = ServerTester.Create())
@@ -163,7 +163,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public async void CanGetCurrencyListFromChangelly()
         {
             using (var tester = ServerTester.Create())
@@ -196,7 +196,7 @@ namespace BTCPayServer.Tests
 
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public async void CanCalculateToAmountForChangelly()
         {
             using (var tester = ServerTester.Create())
diff --git a/BTCPayServer.Tests/RateRulesTest.cs b/BTCPayServer.Tests/RateRulesTest.cs
index d1c1f7ea3..fe309cea4 100644
--- a/BTCPayServer.Tests/RateRulesTest.cs
+++ b/BTCPayServer.Tests/RateRulesTest.cs
@@ -11,7 +11,7 @@ namespace BTCPayServer.Tests
     public class RateRulesTest
     {
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Fast", "Fast")]
         public void SecondDuplicatedRuleIsIgnored()
         {
             StringBuilder builder = new StringBuilder();
@@ -25,7 +25,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Fast", "Fast")]
         public void CanParseRateRules()
         {
             // Check happy path
diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs
index b18e074a2..1f3c59e0e 100644
--- a/BTCPayServer.Tests/UnitTest1.cs
+++ b/BTCPayServer.Tests/UnitTest1.cs
@@ -261,7 +261,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanAcceptInvoiceWithTolerance()
         {
             var entity = new InvoiceEntity();
@@ -289,7 +289,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanAcceptInvoiceWithTolerance2()
         {
             using (var tester = ServerTester.Create())
@@ -347,7 +347,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanPayUsingBIP70()
         {
             using (var tester = ServerTester.Create())
@@ -398,7 +398,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Unreliable", "Unreliable")]
+        [Trait("Integration", "Integration")]
         public async Task CanSetLightningServer()
         {
             using (var tester = ServerTester.Create())
@@ -436,21 +436,21 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Unreliable", "Unreliable")]
+        [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentCLightning()
         {
             await ProcessLightningPayment(LightningConnectionType.CLightning);
         }
 
         [Fact]
-        [Trait("Unreliable", "Unreliable")]
+        [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentCharge()
         {
             await ProcessLightningPayment(LightningConnectionType.Charge);
         }
 
         [Fact]
-        [Trait("Unreliable", "Unreliable")]
+        [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentLnd()
         {
             await ProcessLightningPayment(LightningConnectionType.LndREST);
@@ -502,7 +502,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanUseServerInitiatedPairingCode()
         {
             using (var tester = ServerTester.Create())
@@ -528,7 +528,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanSendIPN()
         {
             using (var callbackServer = new CustomServer())
@@ -565,7 +565,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CantPairTwiceWithSamePubkey()
         {
             using (var tester = ServerTester.Create())
@@ -587,7 +587,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanRescanWallet()
         {
             using (var tester = ServerTester.Create())
@@ -654,7 +654,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanListInvoices()
         {
             using (var tester = ServerTester.Create())
@@ -696,7 +696,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanGetRates()
         {
             using (var tester = ServerTester.Create())
@@ -744,7 +744,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanRBFPayment()
         {
             using (var tester = ServerTester.Create())
@@ -840,7 +840,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void TestAccessBitpayAPI()
         {
             using (var tester = ServerTester.Create())
@@ -907,7 +907,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanUseExchangeSpecificRate()
         {
             using (var tester = ServerTester.Create())
@@ -950,7 +950,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanTweakRate()
         {
             using (var tester = ServerTester.Create())
@@ -995,7 +995,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanHaveLTCOnlyStore()
         {
             using (var tester = ServerTester.Create())
@@ -1060,7 +1060,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanModifyRates()
         {
             using (var tester = ServerTester.Create())
@@ -1121,7 +1121,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanPayWithTwoCurrencies()
         {
             using (var tester = ServerTester.Create())
@@ -1295,7 +1295,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanDisablePaymentMethods()
         {
             using (var tester = ServerTester.Create())
@@ -1354,7 +1354,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Unreliable", "Unreliable")]
+        [Trait("Integration", "Integration")]
         public async Task CanSetPaymentMethodLimits()
         {
             using (var tester = ServerTester.Create())
@@ -1399,7 +1399,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanUsePoSApp()
         {
             using (var tester = ServerTester.Create())
@@ -1444,7 +1444,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanCreateAndDeleteApps()
         {
             using (var tester = ServerTester.Create())
@@ -1481,7 +1481,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void InvoiceFlowThroughDifferentStatesCorrectly()
         {
             using (var tester = ServerTester.Create())
@@ -1638,7 +1638,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CheckQuadrigacxRateProvider()
         {
             var quadri = new QuadrigacxRateProvider();
@@ -1652,7 +1652,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanQueryDirectProviders()
         {
             var factory = CreateBTCPayRateFactory();
@@ -1683,7 +1683,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Reliable", "Reliable")]
+        [Trait("Integration", "Integration")]
         public void CanGetRateCryptoCurrenciesByDefault()
         {
             var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);