diff --git a/db/db_impl.cc b/db/db_impl.cc
index 759da4a99695b5b839078ab5dcd4c7346a376e77..1178d0ea4b0fe87262c6db023d81a1ad52d87ec1 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -277,16 +277,25 @@ DBImpl::DBImpl(const DBOptions& options, const std::string& dbname)
 }
 
 DBImpl::~DBImpl() {
-  // only the default CFD is alive at this point
-  if (default_cf_handle_ != nullptr) {
-    auto default_cfd = default_cf_handle_->cfd();
-    if (flush_on_destroy_ &&
-        default_cfd->mem()->GetFirstSequenceNumber() != 0) {
-      FlushMemTable(default_cfd, FlushOptions());
+  mutex_.Lock();
+  if (flush_on_destroy_) {
+    autovector<ColumnFamilyData*> to_delete;
+    for (auto cfd : *versions_->GetColumnFamilySet()) {
+      if (cfd->mem()->GetFirstSequenceNumber() != 0) {
+        cfd->Ref();
+        mutex_.Unlock();
+        FlushMemTable(cfd, FlushOptions());
+        mutex_.Lock();
+        if (cfd->Unref()) {
+          to_delete.push_back(cfd);
+        }
+      }
+    }
+    for (auto cfd : to_delete) {
+      delete cfd;
     }
   }
 
-  mutex_.Lock();
   // Wait for background work to finish
   shutting_down_.Release_Store(this);  // Any non-nullptr value is ok
   while (bg_compaction_scheduled_ ||
diff --git a/db/db_test.cc b/db/db_test.cc
index 466f926f014251b80702535d1f7015460d758111..5b97fa383838fe22b73ea407b0d19452de3885db 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -1998,34 +1998,35 @@ TEST(DBTest, RollLog) {
 
 TEST(DBTest, WAL) {
   do {
+    CreateAndReopenWithCF({"pikachu"});
     WriteOptions writeOpt = WriteOptions();
     writeOpt.disableWAL = true;
-    ASSERT_OK(dbfull()->Put(writeOpt, "foo", "v1"));
-    ASSERT_OK(dbfull()->Put(writeOpt, "bar", "v1"));
+    ASSERT_OK(dbfull()->Put(writeOpt, handles_[1], "foo", "v1"));
+    ASSERT_OK(dbfull()->Put(writeOpt, handles_[1], "bar", "v1"));
 
-    Reopen();
-    ASSERT_EQ("v1", Get("foo"));
-    ASSERT_EQ("v1", Get("bar"));
+    ReopenWithColumnFamilies({"default", "pikachu"});
+    ASSERT_EQ("v1", Get(1, "foo"));
+    ASSERT_EQ("v1", Get(1, "bar"));
 
     writeOpt.disableWAL = false;
-    ASSERT_OK(dbfull()->Put(writeOpt, "bar", "v2"));
+    ASSERT_OK(dbfull()->Put(writeOpt, handles_[1], "bar", "v2"));
     writeOpt.disableWAL = true;
-    ASSERT_OK(dbfull()->Put(writeOpt, "foo", "v2"));
+    ASSERT_OK(dbfull()->Put(writeOpt, handles_[1], "foo", "v2"));
 
-    Reopen();
+    ReopenWithColumnFamilies({"default", "pikachu"});
     // Both value's should be present.
-    ASSERT_EQ("v2", Get("bar"));
-    ASSERT_EQ("v2", Get("foo"));
+    ASSERT_EQ("v2", Get(1, "bar"));
+    ASSERT_EQ("v2", Get(1, "foo"));
 
     writeOpt.disableWAL = true;
-    ASSERT_OK(dbfull()->Put(writeOpt, "bar", "v3"));
+    ASSERT_OK(dbfull()->Put(writeOpt, handles_[1], "bar", "v3"));
     writeOpt.disableWAL = false;
-    ASSERT_OK(dbfull()->Put(writeOpt, "foo", "v3"));
+    ASSERT_OK(dbfull()->Put(writeOpt, handles_[1], "foo", "v3"));
 
-    Reopen();
+    ReopenWithColumnFamilies({"default", "pikachu"});
     // again both values should be present.
-    ASSERT_EQ("v3", Get("foo"));
-    ASSERT_EQ("v3", Get("bar"));
+    ASSERT_EQ("v3", Get(1, "foo"));
+    ASSERT_EQ("v3", Get(1, "bar"));
   } while (ChangeCompactOptions());
 }
 
@@ -2130,7 +2131,7 @@ TEST(DBTest, FLUSH) {
 
     ReopenWithColumnFamilies({"default", "pikachu"});
     ASSERT_EQ("v1", Get(1, "foo"));
-    ASSERT_EQ("NOT_FOUND", Get(1, "bar"));
+    ASSERT_EQ("v1", Get(1, "bar"));
 
     writeOpt.disableWAL = true;
     ASSERT_OK(dbfull()->Put(writeOpt, handles_[1], "bar", "v2"));
diff --git a/utilities/backupable/backupable_db_test.cc b/utilities/backupable/backupable_db_test.cc
index 5c20579b448927219027b3c38c972377d93d6101..74e703e9eb4ca987fcc7e14e4bd49989ddf78f38 100644
--- a/utilities/backupable/backupable_db_test.cc
+++ b/utilities/backupable/backupable_db_test.cc
@@ -721,6 +721,8 @@ TEST(BackupableDBTest, FailOverwritingBackups) {
   OpenBackupableDB(true);
   for (int i = 0; i < 5; ++i) {
     FillDB(db_.get(), 100 * i, 100 * (i + 1));
+    CloseBackupableDB();
+    OpenBackupableDB(false);
     ASSERT_OK(db_->CreateNewBackup(true));
     CloseBackupableDB();
     OpenBackupableDB(false);