diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp
index d5fbf633d..c37a8e4ab 100644
--- a/nano/core_test/block_store.cpp
+++ b/nano/core_test/block_store.cpp
@@ -639,7 +639,7 @@ namespace lmdb
 		if (nano::rocksdb_config::using_rocksdb_in_tests ())
 		{
 			// Don't test this in rocksdb mode
-			return;
+			GTEST_SKIP ();
 		}
 		// Check that upgrading from an unsupported version is not supported
 		auto path (nano::unique_path ());
@@ -693,7 +693,7 @@ TEST (mdb_block_store, bad_path)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	nano::logger_mt logger;
 	nano::lmdb::store store (logger, boost::filesystem::path ("///"), nano::dev::constants);
@@ -1057,7 +1057,7 @@ TEST (mdb_block_store, sideband_height)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	nano::logger_mt logger;
 	nano::keypair key1;
@@ -1430,7 +1430,7 @@ namespace lmdb
 		if (nano::rocksdb_config::using_rocksdb_in_tests ())
 		{
 			// Don't test this in rocksdb mode
-			return;
+			GTEST_SKIP ();
 		}
 		// Extract confirmation height to a separate database
 		auto path (nano::unique_path ());
@@ -1593,7 +1593,7 @@ namespace lmdb
 		if (nano::rocksdb_config::using_rocksdb_in_tests ())
 		{
 			// Don't test this in rocksdb mode
-			return;
+			GTEST_SKIP ();
 		}
 		auto path (nano::unique_path ());
 		nano::mdb_val value;
@@ -1640,7 +1640,7 @@ namespace lmdb
 		if (nano::rocksdb_config::using_rocksdb_in_tests ())
 		{
 			// Don't test this in rocksdb mode
-			return;
+			GTEST_SKIP ();
 		}
 		nano::work_pool pool{ nano::dev::network_params.network, std::numeric_limits<unsigned>::max () };
 		nano::block_builder builder;
@@ -1730,7 +1730,7 @@ namespace lmdb
 		if (nano::rocksdb_config::using_rocksdb_in_tests ())
 		{
 			// Don't test this in rocksdb mode
-			return;
+			GTEST_SKIP ();
 		}
 		auto path (nano::unique_path ());
 		nano::block_builder builder;
@@ -2039,7 +2039,7 @@ namespace lmdb
 		if (nano::rocksdb_config::using_rocksdb_in_tests ())
 		{
 			// Don't test this in rocksdb mode
-			return;
+			GTEST_SKIP ();
 		}
 		auto path (nano::unique_path ());
 		nano::keypair key1;
@@ -2176,7 +2176,7 @@ namespace lmdb
 		if (nano::rocksdb_config::using_rocksdb_in_tests ())
 		{
 			// Don't test this in rocksdb mode
-			return;
+			GTEST_SKIP ();
 		}
 		auto path (nano::unique_path ());
 		nano::logger_mt logger;
@@ -2205,7 +2205,7 @@ namespace lmdb
 		if (nano::rocksdb_config::using_rocksdb_in_tests ())
 		{
 			// Don't test this in rocksdb mode
-			return;
+			GTEST_SKIP ();
 		}
 		auto path (nano::unique_path ());
 		nano::logger_mt logger;
@@ -2236,7 +2236,7 @@ TEST (mdb_block_store, upgrade_backup)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	auto dir (nano::unique_path ());
 	namespace fs = boost::filesystem;
@@ -2277,7 +2277,7 @@ TEST (block_store, confirmation_height)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	auto path (nano::unique_path ());
 	nano::logger_mt logger;
@@ -2323,7 +2323,7 @@ TEST (block_store, final_vote)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode as deletions cause inaccurate counts
-		return;
+		GTEST_SKIP ();
 	}
 	auto path (nano::unique_path ());
 	nano::logger_mt logger;
@@ -2441,7 +2441,7 @@ TEST (rocksdb_block_store, tombstone_count)
 {
 	if (!nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
-		return;
+		GTEST_SKIP ();
 	}
 	nano::test::system system{};
 	nano::logger_mt logger;
diff --git a/nano/core_test/confirmation_height.cpp b/nano/core_test/confirmation_height.cpp
index 49b5262f1..124dbacc4 100644
--- a/nano/core_test/confirmation_height.cpp
+++ b/nano/core_test/confirmation_height.cpp
@@ -1195,7 +1195,7 @@ TEST (confirmation_heightDeathTest, rollback_added_block)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	// For ASSERT_DEATH_IF_SUPPORTED
 	testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -1287,7 +1287,7 @@ TEST (confirmation_heightDeathTest, modified_chain)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	// For ASSERT_DEATH_IF_SUPPORTED
 	testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -1365,7 +1365,7 @@ TEST (confirmation_heightDeathTest, modified_chain_account_removed)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	// For ASSERT_DEATH_IF_SUPPORTED
 	testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -2083,7 +2083,7 @@ TEST (confirmation_height, unbounded_block_cache_iteration)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	nano::logger_mt logger;
 	auto path (nano::unique_path ());
diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp
index b6f8024fd..8efab6b9e 100644
--- a/nano/core_test/ledger.cpp
+++ b/nano/core_test/ledger.cpp
@@ -17,7 +17,7 @@ TEST (ledger, store_error)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	auto ctx = nano::test::context::ledger_empty ();
 }
diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
index a88c72a43..4a20b81f8 100644
--- a/nano/core_test/node.cpp
+++ b/nano/core_test/node.cpp
@@ -3338,7 +3338,7 @@ TEST (node, bidirectional_tcp)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 #endif
 	nano::test::system system;
diff --git a/nano/core_test/unchecked_map.cpp b/nano/core_test/unchecked_map.cpp
index b47141318..ee7a3f635 100644
--- a/nano/core_test/unchecked_map.cpp
+++ b/nano/core_test/unchecked_map.cpp
@@ -138,7 +138,7 @@ TEST (unchecked, multiple)
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
 	{
 		// Don't test this in rocksdb mode
-		return;
+		GTEST_SKIP ();
 	}
 	nano::logger_mt logger{};
 	auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);