diff --git a/test/_test.js b/test/_test.js
index 0c95e3e5e..ed449197d 100644
--- a/test/_test.js
+++ b/test/_test.js
@@ -73,9 +73,11 @@ function hexToArrayBuffer(str) {
   return ret;
 };
 
-function deleteDatabase(done) {
-  indexedDB.deleteDatabase('test').then(done);
-};
+/* Delete the database before running any tests */
+before(function(done) {
+  var idbReq = indexedDB.deleteDatabase('test');
+  idbReq.onsuccess = function() { done(); };
+});
 
 function clearDatabase(done) {
     var convos = new Whisper.ConversationCollection();
diff --git a/test/test.js b/test/test.js
index 0628a9a14..ace212071 100644
--- a/test/test.js
+++ b/test/test.js
@@ -10947,9 +10947,11 @@ function hexToArrayBuffer(str) {
   return ret;
 };
 
-function deleteDatabase(done) {
-  indexedDB.deleteDatabase('test').then(done);
-};
+/* Delete the database before running any tests */
+before(function(done) {
+  var idbReq = indexedDB.deleteDatabase('test');
+  idbReq.onsuccess = function() { done(); };
+});
 
 function clearDatabase(done) {
     var convos = new Whisper.ConversationCollection();