diff --git a/faiss/IndexHNSW.cpp b/faiss/IndexHNSW.cpp
index 8e5c654f04..c0bb81c052 100644
--- a/faiss/IndexHNSW.cpp
+++ b/faiss/IndexHNSW.cpp
@@ -948,7 +948,7 @@ void IndexHNSWCagra::search(
 
             std::random_device rd;
             std::mt19937 gen(rd());
-            std::uniform_int_distribution<idx_t> distrib(0, this->ntotal);
+            std::uniform_int_distribution<idx_t> distrib(0, this->ntotal - 1);
 
             for (idx_t j = 0; j < num_base_level_search_entrypoints; j++) {
                 auto idx = distrib(gen);
diff --git a/faiss/gpu/test/TestGpuIndexCagra.cu b/faiss/gpu/test/TestGpuIndexCagra.cu
index 8d330a81cb..a368e496c5 100644
--- a/faiss/gpu/test/TestGpuIndexCagra.cu
+++ b/faiss/gpu/test/TestGpuIndexCagra.cu
@@ -182,7 +182,7 @@ void queryTest(faiss::MetricType metric, double expected_recall) {
                 recall_score.view(),
                 test_dis_mds_opt,
                 ref_dis_mds_opt);
-        ASSERT_TRUE(*recall_score.data_handle() > expected_recall);
+        ASSERT_GT(*recall_score.data_handle(), expected_recall);
     }
 }
 
@@ -330,7 +330,7 @@ void copyToTest(
                 recall_score.view(),
                 copy_ref_dis_mds_opt,
                 ref_dis_mds_opt);
-        ASSERT_TRUE(*recall_score.data_handle() > expected_recall);
+        ASSERT_GT(*recall_score.data_handle(), expected_recall);
     }
 }
 
@@ -452,7 +452,7 @@ void copyFromTest(faiss::MetricType metric, double expected_recall) {
                 recall_score.view(),
                 copy_test_dis_mds_opt,
                 test_dis_mds_opt);
-        ASSERT_TRUE(*recall_score.data_handle() > expected_recall);
+        ASSERT_GT(*recall_score.data_handle(), expected_recall);
     }
 }