diff --git a/db/db_test.cc b/db/db_test.cc
index f6da11c94..36c82c2c8 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -267,7 +267,8 @@ class DBTest {
   enum OptionConfig {
     kDefault,
     kBlockBasedTableWithPrefixHashIndex,
-    kBlockBasedTableWithWholeKeyHashIndex,
+    // TODO(kailiu) figure this out
+    // kBlockBasedTableWithWholeKeyHashIndex,
     kPlainTableFirstBytePrefix,
     kPlainTableAllBytesPrefix,
     kVectorRep,
@@ -5947,14 +5948,8 @@ TEST(DBTest, Randomized) {
       }
 
       if ((step % 100) == 0) {
-        // For DB instances that use the hash index + block-based table, the
-        // iterator will be invalid right when seeking a non-existent key, right
-        // than return a key that is close to it.
-        if (option_config_ != kBlockBasedTableWithWholeKeyHashIndex &&
-            option_config_ != kBlockBasedTableWithPrefixHashIndex) {
-          ASSERT_TRUE(CompareIterators(step, &model, db_, nullptr, nullptr));
-          ASSERT_TRUE(CompareIterators(step, &model, db_, model_snap, db_snap));
-        }
+        ASSERT_TRUE(CompareIterators(step, &model, db_, nullptr, nullptr));
+        ASSERT_TRUE(CompareIterators(step, &model, db_, model_snap, db_snap));
 
         // Save a snapshot from each DB this time that we'll use next
         // time we compare things, to make sure the current state is