diff --git a/js/server/tests/ahuacatl-queries-geo.js b/js/server/tests/ahuacatl-queries-geo.js
index a1932d6cca..f6d07667bc 100644
--- a/js/server/tests/ahuacatl-queries-geo.js
+++ b/js/server/tests/ahuacatl-queries-geo.js
@@ -115,23 +115,23 @@ function ahuacatlGeoTestSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
     setUp : function () {
-      locations = db.UnitTestsAhuacatlLocations;
-      if (locations.count() == 0) {
-        for (var lat = -40; lat <= 40; ++lat) {
-          for (var lon = -40; lon <= 40; ++lon) {
-            locations.save({"latitude" : lat, "longitude" : lon });
-          }
-        }
+      db._drop("UnitTestsAhuacatlLocations");
+      db._drop("UnitTestsAhuacatlLocationsNon");
 
-        locations.ensureGeoIndex("latitude", "longitude");
+      locations = db._create("UnitTestsAhuacatlLocations");
+      for (var lat = -40; lat <= 40; ++lat) {
+        for (var lon = -40; lon <= 40; ++lon) {
+          locations.save({"latitude" : lat, "longitude" : lon });
+        }
       }
 
-      locationsNon = db.UnitTestsAhuacatlLocationsNon;
-      if (locationsNon.count() == 0) {
-        for (var lat = -40; lat <= 40; ++lat) {
-          for (var lon = -40; lon <= 40; ++lon) {
-            locationsNon.save({"latitude" : lat, "longitude" : lon });
-          }
+      locations.ensureGeoIndex("latitude", "longitude");
+
+      locationsNon = db._create("UnitTestsAhuacatlLocationsNon");
+
+      for (var lat = -40; lat <= 40; ++lat) {
+        for (var lon = -40; lon <= 40; ++lon) {
+          locationsNon.save({"latitude" : lat, "longitude" : lon });
         }
       }
     },
@@ -141,6 +141,8 @@ function ahuacatlGeoTestSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
     tearDown : function () {
+      db._drop("UnitTestsAhuacatlLocations");
+      db._drop("UnitTestsAhuacatlLocationsNon");
     },
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/js/server/tests/ahuacatl-refaccess-attribute.js b/js/server/tests/ahuacatl-refaccess-attribute.js
index 3c70f0f27e..4ba16f5e71 100644
--- a/js/server/tests/ahuacatl-refaccess-attribute.js
+++ b/js/server/tests/ahuacatl-refaccess-attribute.js
@@ -62,15 +62,14 @@ function ahuacatlRefAccessAttributeTestSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
     setUp : function () {
-      collection = internal.db.UnitTestsAhuacatlRefAccess;
+      internal.db._drop("UnitTestsAhuacatlRefAccess");
+      collection = internal.db._create("UnitTestsAhuacatlRefAccess");
 
-      if (collection.count() == 0) {
-        for (var i = 1; i <= 10; ++i) {
-          collection.save({ "val" : i });
-        }
-
-        collection.ensureSkiplist("val");
+      for (var i = 1; i <= 10; ++i) {
+        collection.save({ "val" : i });
       }
+
+      collection.ensureSkiplist("val");
     },
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -78,6 +77,7 @@ function ahuacatlRefAccessAttributeTestSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
     tearDown : function () {
+      internal.db._drop("UnitTestsAhuacatlRefAccess");
     },
 
 ////////////////////////////////////////////////////////////////////////////////