diff --git a/bin/node/cli/tests/running_the_node_and_interrupt.rs b/bin/node/cli/tests/running_the_node_and_interrupt.rs
index 2a3e11450a539..74203d77eb660 100644
--- a/bin/node/cli/tests/running_the_node_and_interrupt.rs
+++ b/bin/node/cli/tests/running_the_node_and_interrupt.rs
@@ -76,6 +76,9 @@ async fn running_the_node_works_and_can_be_interrupted() {
 	run_command_and_kill(SIGTERM).await;
 }
 
+# The test is flaky (fixed in version polkadot-0.9.42)
+# PR https://github.com/paritytech/substrate/pull/13505/files#diff-ebc30d2796db9889bdd0c10733b3ec29dec48b731f651d969c6612d68c39c832R72
+# For now, we've increased the waiting time for blocks finalization from 30 to 45 seconds. From that moment on, the test never failed again.
 #[tokio::test]
 async fn running_two_nodes_with_the_same_ws_port_should_work() {
 	fn start_node() -> Child {
diff --git a/client/beefy/rpc/src/lib.rs b/client/beefy/rpc/src/lib.rs
index 18e881cfdb49d..e59b3c0131f7b 100644
--- a/client/beefy/rpc/src/lib.rs
+++ b/client/beefy/rpc/src/lib.rs
@@ -248,9 +248,9 @@ mod tests {
 		);
 	}
 
-	#[tokio::test]
-	// Will be removed in commit https://github.com/paritytech/substrate/commit/abb80e54aa260514a4f12712a9ff8ef944e3b4ec
+	// Will be removed in version polkadot-0.9.25 (https://github.com/paritytech/substrate/commit/abb80e54aa260514a4f12712a9ff8ef944e3b4ec)
 	#[ignore]
+	#[tokio::test]
 	async fn subscribe_and_unsubscribe_to_justifications() {
 		let (rpc, _) = setup_io_handler();
 
diff --git a/client/finality-grandpa/rpc/src/lib.rs b/client/finality-grandpa/rpc/src/lib.rs
index 9d56c64dfdd33..a412a7db3800f 100644
--- a/client/finality-grandpa/rpc/src/lib.rs
+++ b/client/finality-grandpa/rpc/src/lib.rs
@@ -312,9 +312,9 @@ mod tests {
 		assert_eq!(expected_response, result);
 	}
 
-	#[tokio::test]
-	// Will be removed in commit https://github.com/paritytech/substrate/commit/abb80e54aa260514a4f12712a9ff8ef944e3b4ec
+	// Will be removed in version polkadot-0.9.25 (https://github.com/paritytech/substrate/commit/abb80e54aa260514a4f12712a9ff8ef944e3b4ec)
 	#[ignore]
+	#[tokio::test]
 	async fn subscribe_and_unsubscribe_to_justifications() {
 		let (rpc, _) = setup_io_handler(TestVoterState);
 		// Subscribe call.