diff --git a/db/db_iterator_test.cc b/db/db_iterator_test.cc
index 8eee3c0ce..210b0d733 100644
--- a/db/db_iterator_test.cc
+++ b/db/db_iterator_test.cc
@@ -2480,8 +2480,8 @@ class DBIteratorWithReadCallbackTest : public DBIteratorTest {};
 TEST_F(DBIteratorWithReadCallbackTest, ReadCallback) {
   class TestReadCallback : public ReadCallback {
    public:
-    explicit TestReadCallback(SequenceNumber max_visible_seq)
-        : ReadCallback(max_visible_seq) {}
+    explicit TestReadCallback(SequenceNumber _max_visible_seq)
+        : ReadCallback(_max_visible_seq) {}
 
     bool IsVisibleFullCheck(SequenceNumber seq) override {
       return seq <= max_visible_seq_;
diff --git a/db/deletefile_test.cc b/db/deletefile_test.cc
index 0905c90cc..3ae464c58 100644
--- a/db/deletefile_test.cc
+++ b/db/deletefile_test.cc
@@ -71,7 +71,9 @@ class DeleteFileTest : public testing::Test {
     }
     db_ = nullptr;
     options_.create_if_missing = create;
-    return DB::Open(options_, dbname_, &db_);
+    Status s = DB::Open(options_, dbname_, &db_);
+    assert(db_);
+    return s;
   }
 
   void CloseDB() {