diff --git a/db/db_test.cc b/db/db_test.cc
index 1ec56d712..665993ea7 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -265,9 +265,9 @@ class DBTest {
  protected:
   // Sequence of option configurations to try
   enum OptionConfig {
+    kBlockBasedTableWithWholeKeyHashIndex,
     kDefault,
     kBlockBasedTableWithPrefixHashIndex,
-    kBlockBasedTableWithWholeKeyHashIndex,
     kPlainTableFirstBytePrefix,
     kPlainTableAllBytesPrefix,
     kVectorRep,
@@ -6249,14 +6249,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