diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
index 2004a9c94..e635d8c46 100644
--- a/nano/core_test/node.cpp
+++ b/nano/core_test/node.cpp
@@ -2662,13 +2662,6 @@ TEST (node, dont_write_lock_node)
 
 TEST (node, bidirectional_tcp)
 {
-#ifdef _WIN32
-	if (nano::rocksdb_config::using_rocksdb_in_tests ())
-	{
-		// Don't test this in rocksdb mode
-		GTEST_SKIP ();
-	}
-#endif
 	nano::test::system system;
 	nano::node_flags node_flags;
 	// Disable bootstrap to start elections for new blocks
diff --git a/nano/core_test/peer_container.cpp b/nano/core_test/peer_container.cpp
index 44f7993b7..045943677 100644
--- a/nano/core_test/peer_container.cpp
+++ b/nano/core_test/peer_container.cpp
@@ -55,7 +55,7 @@ TEST (peer_container, reserved_ip_is_not_a_peer)
 
 // Test the TCP channel cleanup function works properly. It is used to remove peers that are not
 // exchanging messages after a while.
-TEST (peer_container, tcp_channel_cleanup_works)
+TEST (peer_container, DISABLED_tcp_channel_cleanup_works)
 {
 	nano::test::system system;
 	nano::node_config node_config = system.default_config ();
@@ -90,6 +90,7 @@ TEST (peer_container, tcp_channel_cleanup_works)
 
 	for (auto it = 0; node1.network.tcp_channels.size () > 1 && it < 10; ++it)
 	{
+		// FIXME: This is racy and doesn't work reliably
 		// we can't control everything the nodes are doing in background, so using the middle time as
 		// the cutoff point.
 		auto const channel1_last_packet_sent = channel1->get_last_packet_sent ();