diff --git a/integration-tests/src/tests/client/chunks_management.rs b/integration-tests/src/tests/client/chunks_management.rs
index 7632ea7b837..90609b29282 100644
--- a/integration-tests/src/tests/client/chunks_management.rs
+++ b/integration-tests/src/tests/client/chunks_management.rs
@@ -362,18 +362,20 @@ fn chunks_produced_and_distributed_one_val_per_shard_should_succeed_even_without
 /// Note that due to #7385 (which sends chunk forwarding messages irrespective of shard assignment),
 /// we disable chunk forwarding messages for the following tests, so we can focus on chunk
 /// requesting behavior.
-#[test]
-#[cfg_attr(not(feature = "expensive_tests"), ignore)]
-fn chunks_recovered_from_others() {
-    Test {
-        validator_groups: 2,
-        chunk_only_producers: false,
-        drop_to_4_from: &["test1"],
-        drop_all_chunk_forward_msgs: true,
-        block_timeout: 4 * CHUNK_REQUEST_SWITCH_TO_OTHERS_MS,
-    }
-    .run()
-}
+/// TODO: this test is broken due to (#8395) - with fix in #8211
+
+//#[test]
+//#[cfg_attr(not(feature = "expensive_tests"), ignore)]
+//fn chunks_recovered_from_others() {
+//    Test {
+//        validator_groups: 2,
+//        chunk_only_producers: false,
+//        drop_to_4_from: &["test1"],
+//        drop_all_chunk_forward_msgs: true,
+//        block_timeout: 4 * CHUNK_REQUEST_SWITCH_TO_OTHERS_MS,
+//    }
+//    .run()
+//}
 
 /// Same test as above, but the number of validator groups is four, therefore test2 doesn't have the
 /// part test4 needs. The only way test4 can recover the part is by reconstructing the whole chunk,
diff --git a/nightly/pytest-sanity.txt b/nightly/pytest-sanity.txt
index 7ab05afbb9b..7481efa806d 100644
--- a/nightly/pytest-sanity.txt
+++ b/nightly/pytest-sanity.txt
@@ -41,12 +41,14 @@ pytest --timeout=600 sanity/state_sync_routed.py manytx 115 --features nightly
 #pytest --timeout=300 sanity/state_sync_late.py notx --features nightly
 
 pytest --timeout=3600 sanity/state_sync_massive.py
-pytest --timeout=3600 sanity/state_sync_massive.py --features nightly
 pytest --timeout=3600 sanity/state_sync_massive_validator.py
-pytest --timeout=3600 sanity/state_sync_massive_validator.py --features nightly
-pytest sanity/sync_chunks_from_archival.py
-pytest sanity/sync_chunks_from_archival.py --features nightly
+#  TODO(#8322) - re-enable these tests when flat storage starts supporting loading from state dump
+# pytest --timeout=3600 sanity/state_sync_massive.py --features nightly
+# pytest --timeout=3600 sanity/state_sync_massive_validator.py --features nightly
 
+# TODO(#8211) - tests broken due to bad behavior in chunk fetching - re-enable when that PR is submitted.
+# pytest sanity/sync_chunks_from_archival.py
+# pytest sanity/sync_chunks_from_archival.py --features nightly
 pytest sanity/rpc_tx_forwarding.py
 pytest sanity/rpc_tx_forwarding.py --features nightly
 pytest --timeout=240 sanity/skip_epoch.py
diff --git a/pytest/tests/sanity/rpc_finality.py b/pytest/tests/sanity/rpc_finality.py
old mode 100755
new mode 100644