diff --git a/db/db_test.cc b/db/db_test.cc
index 701c72e11..e08462bf4 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -294,8 +294,8 @@ class DBTest {
  protected:
   // Sequence of option configurations to try
   enum OptionConfig {
-    kBlockBasedTableWithWholeKeyHashIndex,
     kDefault,
+    kBlockBasedTableWithWholeKeyHashIndex,
     kBlockBasedTableWithPrefixHashIndex,
     kPlainTableFirstBytePrefix,
     kPlainTableAllBytesPrefix,
@@ -467,7 +467,7 @@ class DBTest {
         options.db_log_dir = test::TmpDir();
         break;
       case kWalDir:
-        options.wal_dir = "/tmp/wal";
+        options.wal_dir = test::TmpDir() + "/wal";
         break;
       case kManifestFileSize:
         options.max_manifest_file_size = 50; // 50 bytes