diff --git a/test/cluster/test_blocked_bootstrap.py b/test/cluster/test_blocked_bootstrap.py
index 5f0d9d2855..f1bb3d79ff 100644
--- a/test/cluster/test_blocked_bootstrap.py
+++ b/test/cluster/test_blocked_bootstrap.py
@@ -11,7 +11,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-@pytest.mark.skip(reason = "can't make it work with the new join procedure, without error recovery")
+@pytest.mark.skip_not_implemented(reason="can't make it work with the new join procedure, without error recovery")
 @pytest.mark.skip_mode(mode='release', reason='error injections are not supported in release mode')
 @pytest.mark.asyncio
 async def test_blocked_bootstrap(manager: ManagerClient):
diff --git a/test/cluster/test_mv.py b/test/cluster/test_mv.py
index 2b074ff064..883e87d305 100644
--- a/test/cluster/test_mv.py
+++ b/test/cluster/test_mv.py
@@ -22,7 +22,7 @@ pytestmark = pytest.mark.prepare_3_racks_cluster
 
 
 @pytest.mark.asyncio
-@pytest.mark.skip(reason="tombstone_gc repair mode is not supported yet for MVs due to #24816")
+@pytest.mark.skip_not_implemented(reason="tombstone_gc repair mode is not supported yet for MVs due to #24816")
 async def test_mv_tombstone_gc_setting(manager):
     """
     Test that the tombstone_gc parameter can be set on a materialized view,
diff --git a/test/cluster/test_tablets_colocation.py b/test/cluster/test_tablets_colocation.py
index 280514ae7e..3b5e87cd39 100644
--- a/test/cluster/test_tablets_colocation.py
+++ b/test/cluster/test_tablets_colocation.py
@@ -388,7 +388,7 @@ async def test_create_colocated_table_while_base_is_migrating(manager: ManagerCl
 # 4. run tablet repair on the base table
 # 5. verify both the base table and the view contain the missing data on the node that was down
 @pytest.mark.asyncio
-@pytest.mark.skip(reason="tablet repair of colocated tables is not supported currently")
+@pytest.mark.skip_not_implemented(reason="tablet repair of colocated tables is not supported currently")
 async def test_repair_colocated_base_and_view(manager: ManagerClient):
     cfg = {'enable_tablets': True}
     cmdline = [
diff --git a/test/cqlpy/cassandra_tests/validation/entities/collections_test.py b/test/cqlpy/cassandra_tests/validation/entities/collections_test.py
index c772b6d4c7..42f9fde8cb 100644
--- a/test/cqlpy/cassandra_tests/validation/entities/collections_test.py
+++ b/test/cqlpy/cassandra_tests/validation/entities/collections_test.py
@@ -749,7 +749,7 @@ def testRemovalThroughUpdate(cql, test_keyspace):
 # checks the validity of the prepared-statement binding before passing it
 # to the server, so the following tests fail in the client library, not
 # in the server.
-@pytest.mark.skip(reason="Python driver checks this before reaching server")
+@pytest.mark.skip_not_implemented(reason="Python driver checks this before reaching server")
 def testInvalidInputForList(cql, test_keyspace):
     with create_table(cql, test_keyspace, "(pk int PRIMARY KEY, l list<text>)") as table:
         assert_invalid_message(cql, table, "Not enough bytes to read a list",
@@ -761,7 +761,7 @@ def testInvalidInputForList(cql, test_keyspace):
         assert_invalid_message(cql, table, "The data cannot be deserialized as a list",
                              "INSERT INTO %s (pk, l) VALUES (?, ?)", 1, -1);
 
-@pytest.mark.skip(reason="Python driver checks this before reaching server")
+@pytest.mark.skip_not_implemented(reason="Python driver checks this before reaching server")
 def testInvalidInputForSet(cql, test_keyspace):
     with create_table(cql, test_keyspace, "(pk int PRIMARY KEY, s set<text>)") as table:
         assert_invalid_message(cql, table, "Not enough bytes to read a set",
@@ -773,7 +773,7 @@ def testInvalidInputForSet(cql, test_keyspace):
         assert_invalid_message(cql, table, "The data cannot be deserialized as a set",
                              "INSERT INTO %s (pk, s) VALUES (?, ?)", 1, -1);
 
-@pytest.mark.skip(reason="Python driver checks this before reaching server")
+@pytest.mark.skip_not_implemented(reason="Python driver checks this before reaching server")
 def testInvalidInputForMap(cql, test_keyspace):
     with create_table(cql, test_keyspace, "(pk int PRIMARY KEY, m set<text, text>)") as table:
         assert_invalid_message(cql, table, "Not enough bytes to read a map",
diff --git a/test/cqlpy/cassandra_tests/validation/operations/select_test.py b/test/cqlpy/cassandra_tests/validation/operations/select_test.py
index b73113fd59..09301afa76 100644
--- a/test/cqlpy/cassandra_tests/validation/operations/select_test.py
+++ b/test/cqlpy/cassandra_tests/validation/operations/select_test.py
@@ -2644,7 +2644,7 @@ def testTokenFctRejectsInvalidColumnCount(cql, test_keyspace):
 
 # UDF test skipped because of different languages in Scylla.
 # TODO: Finish translating this test.
-@pytest.mark.skip("UDF tests not yet translated")
+@pytest.mark.skip_not_implemented(reason="UDF tests not yet translated")
 def testCreatingUDFWithSameNameAsBuiltin_PrefersCompatibleArgs_SameKeyspace(cql, test_keyspace):
     with create_table(cql, test_keyspace, f"(k1 uuid, k2 text, PRIMARY KEY ((k1, k2)))") as table:
         createFunctionOverload(KEYSPACE + ".token", "double",
@@ -2654,7 +2654,7 @@ def testCreatingUDFWithSameNameAsBuiltin_PrefersCompatibleArgs_SameKeyspace(cql,
 
 # UDF test skipped because of different languages in Scylla.
 # TODO: Finish translating this test.
-@pytest.mark.skip("UDF tests not yet translated")
+@pytest.mark.skip_not_implemented(reason="UDF tests not yet translated")
 def testCreatingUDFWithSameNameAsBuiltin_FullyQualifiedFunctionNameWorks(cql, test_keyspace):
     with create_table(cql, test_keyspace, f"(k1 uuid, k2 text, PRIMARY KEY ((k1, k2)))") as table:
         createFunctionOverload(KEYSPACE + ".token", "double",
@@ -2664,7 +2664,7 @@ def testCreatingUDFWithSameNameAsBuiltin_FullyQualifiedFunctionNameWorks(cql, te
 
 # UDF test skipped because of different languages in Scylla.
 # TODO: Finish translating this test.
-@pytest.mark.skip("UDF tests not yet translated")
+@pytest.mark.skip_not_implemented(reason="UDF tests not yet translated")
 def testCreatingUDFWithSameNameAsBuiltin_PrefersCompatibleArgs(cql, test_keyspace):
     with create_table(cql, test_keyspace, f"(k1 uuid, k2 text, PRIMARY KEY ((k1, k2)))") as table:
         createFunctionOverload(KEYSPACE + ".token", "double",
@@ -2674,7 +2674,7 @@ def testCreatingUDFWithSameNameAsBuiltin_PrefersCompatibleArgs(cql, test_keyspac
 
 # UDF test skipped because of different languages in Scylla.
 # TODO: Finish translating this test.
-@pytest.mark.skip("UDF tests not yet translated")
+@pytest.mark.skip_not_implemented(reason="UDF tests not yet translated")
 def testCreatingUDFWithSameNameAsBuiltin_FullyQualifiedFunctionNameWorks_SystemKeyspace(cql, test_keyspace):
     with create_table(cql, test_keyspace, f"(k1 uuid, k2 text, PRIMARY KEY ((k1, k2)))") as table:
         createFunctionOverload(KEYSPACE + ".token", "double",