diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bc70079e3b..9278a41f17 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -128,9 +128,12 @@ if(WITH_PYTHON)
   add_fdb_test(TEST_FILES fast/BackupCorrectnessClean.toml)
   add_fdb_test(TEST_FILES fast/BackupToDBCorrectness.toml)
   add_fdb_test(TEST_FILES fast/BackupToDBCorrectnessClean.toml)
+  add_fdb_test(TEST_FILES fast/BlobGranuleVerifyAtomicOps.toml)
+  add_fdb_test(TEST_FILES fast/BlobGranuleVerifyCycle.toml)
   add_fdb_test(TEST_FILES fast/BlobGranuleVerifySmall.toml)
   add_fdb_test(TEST_FILES fast/BlobGranuleVerifySmallClean.toml)
-  add_fdb_test(TEST_FILES fast/BlobGranuleMoveVerifyCycle.toml)
+  # TODO: test occasionally times out due to too many change feed shard parts
+  add_fdb_test(TEST_FILES fast/BlobGranuleMoveVerifyCycle.toml IGNORE)
   add_fdb_test(TEST_FILES fast/CacheTest.toml)
   add_fdb_test(TEST_FILES fast/CloggedSideband.toml)
   add_fdb_test(TEST_FILES fast/CompressionUtilsUnit.toml)
@@ -200,8 +203,6 @@ if(WITH_PYTHON)
     add_fdb_test(TEST_FILES fast/PhysicalShardMove.toml IGNORE)
     add_fdb_test(TEST_FILES fast/StorageServerCheckpointRestore.toml  IGNORE)
   endif()
-  add_fdb_test(TEST_FILES rare/BlobGranuleVerifyAtomicOps.toml)
-  add_fdb_test(TEST_FILES rare/BlobGranuleVerifyCycle.toml)
   add_fdb_test(TEST_FILES rare/CheckRelocation.toml)
   add_fdb_test(TEST_FILES rare/ClogUnclog.toml)
   add_fdb_test(TEST_FILES rare/CloggedCycleWithKills.toml)
diff --git a/tests/rare/BlobGranuleVerifyAtomicOps.toml b/tests/fast/BlobGranuleVerifyAtomicOps.toml
similarity index 100%
rename from tests/rare/BlobGranuleVerifyAtomicOps.toml
rename to tests/fast/BlobGranuleVerifyAtomicOps.toml
diff --git a/tests/rare/BlobGranuleVerifyCycle.toml b/tests/fast/BlobGranuleVerifyCycle.toml
similarity index 100%
rename from tests/rare/BlobGranuleVerifyCycle.toml
rename to tests/fast/BlobGranuleVerifyCycle.toml