diff --git a/browserid/tests/db-test.js b/browserid/tests/db-test.js
index 3fe80e327a842d4c129da8143a9dc8e670f33b6b..1feb09d2130d35ca93be2398b0da84456e3e7ed2 100755
--- a/browserid/tests/db-test.js
+++ b/browserid/tests/db-test.js
@@ -396,14 +396,14 @@ function addTestsForDriver(driver) {
 }
 
 // test all available drivers
-fs.readdir(path.join(__dirname, "..", "lib"), function(err, files) {
-  files.forEach(function(f) {
-    var m = /^db_(.+)\.js$/.exec(f);
-    if (m) addTestsForDriver(m[1]);
-  });
+files = fs.readdirSync(path.join(__dirname, "..", "lib"));
 
-  // run or export the suite.
-  if (process.argv[1] === __filename) suite.run();
-  else suite.export(module);
+files.forEach(function(f) {
+  var m = /^db_(.+)\.js$/.exec(f);
+  if (m) addTestsForDriver(m[1]);
 });
 
+// run or export the suite.
+if (process.argv[1] === __filename) suite.run();
+else suite.export(module);
+