diff --git a/ent/src/yb/integration-tests/CMakeLists-include.txt b/ent/src/yb/integration-tests/CMakeLists-include.txt
index fbaeb933731f..951a66f3b05b 100644
--- a/ent/src/yb/integration-tests/CMakeLists-include.txt
+++ b/ent/src/yb/integration-tests/CMakeLists-include.txt
@@ -1,3 +1,3 @@
 # Copyright (c) YugaByte, Inc.
 
-ADD_YB_TEST(snapshot-test RESOURCE_LOCK "master-rpc-ports")
+ADD_YB_TEST(snapshot-test)
diff --git a/ent/src/yb/integration-tests/snapshot-test.cc b/ent/src/yb/integration-tests/snapshot-test.cc
index aa782777561d..84798b4c460d 100644
--- a/ent/src/yb/integration-tests/snapshot-test.cc
+++ b/ent/src/yb/integration-tests/snapshot-test.cc
@@ -406,8 +406,8 @@ TEST_F(SnapshotTest, SnapshotRemoteBootstrap) {
 
   workload.StopAndJoin();
 
-  cluster_->FlushTablets();
-  cluster_->CleanTabletLogs();
+  ASSERT_OK(cluster_->FlushTablets());
+  ASSERT_OK(cluster_->CleanTabletLogs());
 
   ASSERT_OK(ts0->Start());
   ASSERT_NO_FATALS(VerifySnapshotFiles(snapshot_id));