diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 0aa6b33e..c399fb68 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -47,9 +47,9 @@ jobs:
           echo "${{secrets.REDIS_USER_PRIVATE_KEY}}" > tests/NRedisStack.Tests/bin/Debug/net6.0/redis_user_private.key
           ls -R
           if [ "$REDIS_VERSION" != "edge" ]; then
-            dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter Category!=edge
-          elif [ "$REDIS_VERSION" != "7.2.0-RC3" ]; then
-            dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter Category!=7.2.0-RC3
+            dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter RunOnlyOnThisVersion!=edge
+          elif [ "$REDIS_VERSION" == "7.2.0-RC3" ]; then
+            dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter SkipIfThisIsTheVersoin!=7.2.0-RC3
           else
             dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
           fi
@@ -60,7 +60,7 @@ jobs:
           echo "${{secrets.REDIS_USER_PRIVATE_KEY}}" > tests/NRedisStack.Tests/bin/Debug/net7.0/redis_user_private.key
           ls -R
           if [ "$REDIS_VERSION" != "edge" ]; then
-            dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter Category!=edge
+            dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter RunOnlyOnThisVersion!=edge
           else
             dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
           fi
@@ -107,4 +107,4 @@ jobs:
         shell: cmd
         run: |
           START wsl ./redis-stack-server-${{env.redis_stack_version}}/bin/redis-stack-server &
-          dotnet test -f net481 --no-build --verbosity normal --filter Category!=edge
+          dotnet test -f net481 --no-build --verbosity normal --filter RunOnlyOnThisVersion!=edge
diff --git a/tests/NRedisStack.Tests/Gears/GearsTests.cs b/tests/NRedisStack.Tests/Gears/GearsTests.cs
index 79d7f7ae..429658f1 100644
--- a/tests/NRedisStack.Tests/Gears/GearsTests.cs
+++ b/tests/NRedisStack.Tests/Gears/GearsTests.cs
@@ -17,7 +17,7 @@ public void Dispose()
 
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public void TestTFunctionLoadDelete()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -28,7 +28,7 @@ public void TestTFunctionLoadDelete()
 
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public async Task TestTFunctionLoadDeleteAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -40,7 +40,7 @@ public async Task TestTFunctionLoadDeleteAsync()
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public void TestTFunctionList()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -72,7 +72,7 @@ public void TestTFunctionList()
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public async Task TestTFunctionListAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -102,7 +102,7 @@ public async Task TestTFunctionListAsync()
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public void TestTFCall()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -117,7 +117,7 @@ public void TestTFCall()
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public async Task TestTFCallAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -132,7 +132,7 @@ public async Task TestTFCallAsync()
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public void TestGearsCommandBuilder()
     {
         // TFunctionLoad:
diff --git a/tests/NRedisStack.Tests/Graph/GraphTests.cs b/tests/NRedisStack.Tests/Graph/GraphTests.cs
index abe4500a..a0729346 100644
--- a/tests/NRedisStack.Tests/Graph/GraphTests.cs
+++ b/tests/NRedisStack.Tests/Graph/GraphTests.cs
@@ -21,7 +21,7 @@ public void Dispose()
     #region SyncTests
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestReserveBasic()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -30,7 +30,7 @@ public void TestReserveBasic()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestCreateNode()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -54,7 +54,7 @@ public void TestCreateNode()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestCreateLabeledNode()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -76,7 +76,7 @@ public void TestCreateLabeledNode()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestConnectNodes()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -104,7 +104,7 @@ public void TestConnectNodes()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestDeleteNodes()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -152,7 +152,7 @@ public void TestDeleteNodes()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestDeleteRelationship()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -183,7 +183,7 @@ public void TestDeleteRelationship()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestIndex()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -211,7 +211,7 @@ public void TestIndex()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestHeader()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -243,7 +243,7 @@ public void TestHeader()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestRecord()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -369,7 +369,7 @@ public void TestRecord()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestAdditionToProcedures()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -450,7 +450,7 @@ record = iterator.Current;
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestEscapedQuery()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -470,7 +470,7 @@ public void TestEscapedQuery()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestArraySupport()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -571,7 +571,7 @@ record = iterator.Current;
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestPath()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -624,7 +624,7 @@ public void TestPath()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestNullGraphEntities()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -679,7 +679,7 @@ record = resultSet.Skip(1).First();
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void Test64BitNumber()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -698,7 +698,7 @@ public void Test64BitNumber()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestCachedExecution()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -730,7 +730,7 @@ public void TestCachedExecution()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestMapDataType()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -761,7 +761,7 @@ public void TestMapDataType()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestGeoPointLatLon()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -776,7 +776,7 @@ public void TestGeoPointLatLon()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestGeoPointLonLat()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -806,7 +806,7 @@ private void AssertTestGeoPoint(IGraphCommands graph)
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestPoint()
     {
         var point = new Point(30.27822306, -97.75134723);
@@ -819,7 +819,7 @@ public void TestPoint()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void timeoutArgument()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -834,7 +834,7 @@ public void timeoutArgument()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestCachedExecutionReadOnly()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -868,7 +868,7 @@ public void TestCachedExecutionReadOnly()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestSimpleReadOnly()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -884,7 +884,7 @@ public void TestSimpleReadOnly()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestProfile()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -903,7 +903,7 @@ public void TestProfile()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestExplain()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -922,7 +922,7 @@ public void TestExplain()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestSlowlog()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -938,7 +938,7 @@ public void TestSlowlog()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestList()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -952,7 +952,7 @@ public void TestList()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestConfig()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -973,7 +973,7 @@ public void TestConfig()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestModulePrefixs()
     {
         IDatabase db1 = redisFixture.Redis.GetDatabase();
@@ -986,7 +986,7 @@ public void TestModulePrefixs()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestCallProcedureDbLabels()
     {
         var db = redisFixture.Redis.GetDatabase();
@@ -1008,7 +1008,7 @@ public void TestCallProcedureDbLabels()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestCallProcedureReadOnly()
     {
         var db = redisFixture.Redis.GetDatabase();
@@ -1035,7 +1035,7 @@ public void TestCallProcedureReadOnly()
     #region AsyncTests
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestReserveBasicAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1044,7 +1044,7 @@ public async Task TestReserveBasicAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestCreateNodeAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1068,7 +1068,7 @@ public async Task TestCreateNodeAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestCreateLabeledNodeAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1090,7 +1090,7 @@ public async Task TestCreateLabeledNodeAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestConnectNodesAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1119,7 +1119,7 @@ public async Task TestConnectNodesAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestDeleteNodesAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1167,7 +1167,7 @@ public async Task TestDeleteNodesAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestDeleteRelationshipAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1198,7 +1198,7 @@ public async Task TestDeleteRelationshipAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestIndexAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1226,7 +1226,7 @@ public async Task TestIndexAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestHeaderAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1258,7 +1258,7 @@ public async Task TestHeaderAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestRecordAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1386,7 +1386,7 @@ await graph.QueryAsync("social", "MATCH (a:person), (b:person) WHERE (a.name = '
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestAdditionToProceduresAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1467,7 +1467,7 @@ record = iterator.Current;
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestEscapedQueryAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1487,7 +1487,7 @@ public async Task TestEscapedQueryAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestArraySupportAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1588,7 +1588,7 @@ record = iterator.Current;
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestPathAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1641,7 +1641,7 @@ public async Task TestPathAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestNullGraphEntitiesAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1696,7 +1696,7 @@ record = resultSet.Skip(1).First();
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task Test64bitnumberAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1715,7 +1715,7 @@ public async Task Test64bitnumberAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestCachedExecutionAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1747,7 +1747,7 @@ public async Task TestCachedExecutionAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestMapDataTypeAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1778,7 +1778,7 @@ public async Task TestMapDataTypeAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestGeoPointLatLonAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1793,7 +1793,7 @@ public async Task TestGeoPointLatLonAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestGeoPointLonLatAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1822,7 +1822,7 @@ private async Task AssertTestGeoPointAsync(GraphCommands graph)
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task timeoutArgumentAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1837,7 +1837,7 @@ public async Task timeoutArgumentAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestCachedExecutionReadOnlyAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1871,7 +1871,7 @@ public async Task TestCachedExecutionReadOnlyAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestSimpleReadOnlyAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1887,7 +1887,7 @@ public async Task TestSimpleReadOnlyAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestProfileAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1906,7 +1906,7 @@ public async Task TestProfileAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestExplainAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1925,7 +1925,7 @@ public async Task TestExplainAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestSlowlogAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1941,7 +1941,7 @@ public async Task TestSlowlogAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestListAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1955,7 +1955,7 @@ public async Task TestListAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestConfigAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -1976,7 +1976,7 @@ public async Task TestConfigAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestModulePrefixsAsync()
     {
         IDatabase db1 = redisFixture.Redis.GetDatabase();
@@ -1989,7 +1989,7 @@ public async Task TestModulePrefixsAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestCallProcedureDbLabelsAsync()
     {
         var db = redisFixture.Redis.GetDatabase();
@@ -2011,7 +2011,7 @@ public async Task TestCallProcedureDbLabelsAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public async Task TestCallProcedureReadOnlyAsync()
     {
         var db = redisFixture.Redis.GetDatabase();
@@ -2034,7 +2034,7 @@ public async Task TestCallProcedureReadOnlyAsync()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestParseInfinity()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -2049,7 +2049,7 @@ public void TestParseInfinity()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestEqualsAndToString()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -2127,7 +2127,7 @@ public void TestEqualsAndToString()
     }
 
     [Fact]
-    [Trait("Category", "7.2.0-RC3")]
+    [Trait("SkipIfThisIsTheVersoin", "7.2.0-RC3")]
     public void TestPrepareQuery()
     {
         const string return1Query = "RETURN 1";
diff --git a/tests/NRedisStack.Tests/Json/JsonTests.cs b/tests/NRedisStack.Tests/Json/JsonTests.cs
index f437af67..c6555147 100644
--- a/tests/NRedisStack.Tests/Json/JsonTests.cs
+++ b/tests/NRedisStack.Tests/Json/JsonTests.cs
@@ -704,7 +704,7 @@ public async Task GetAsync()
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public void MSet()
     {
         IJsonCommands commands = new JsonCommands(redisFixture.Redis.GetDatabase());
@@ -729,7 +729,7 @@ public void MSet()
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public async Task MSetAsync()
     {
         IJsonCommandsAsync commands = new JsonCommands(redisFixture.Redis.GetDatabase());
@@ -753,7 +753,7 @@ await commands.MSetAsync(values)
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public void Merge()
     {
         // Create a connection to Redis
@@ -773,7 +773,7 @@ public void Merge()
     }
 
     [Fact]
-    [Trait("Category", "edge")]
+    [Trait("RunOnlyOnThisVersion", "edge")]
     public async Task MergeAsync()
     {
         // Create a connection to Redis