diff --git a/test/monger/test/db_test.clj b/test/monger/test/db_test.clj
index c9a0049..afd7023 100644
--- a/test/monger/test/db_test.clj
+++ b/test/monger/test/db_test.clj
@@ -1,44 +1,31 @@
 (ns monger.test.db-test
-  (:require [monger core db]
-            [monger.test.helper :as helper]
+  (:require [monger.db :as mdb]
+            [monger.core :as mg]
             [monger.collection :as mc]
             [clojure.test :refer :all])
   (:import [com.mongodb Mongo DB]
            java.util.Set))
 
-(helper/connect!)
-
-
 
 ;; do not run this test for CI, it complicates matters by messing up
 ;; authentication for some other tests :( MK.
-(when-not (System/getenv "CI")
-  (deftest test-drop-database
-    ;; drop a secondary database here. MK.
-    (monger.core/with-db (monger.core/get-db "monger-test3")
-      (let [collection "test"
-            _          (mc/insert collection {:name "Clojure"})
-            check      (mc/count collection)
-            _          (monger.db/drop-db)]
+(let [conn (mg/connect)]
+  (when-not (System/getenv "CI")
+    (deftest test-drop-database
+      ;; drop a secondary database here. MK.
+      (let [db         (mg/get-db conn "monger-test3")
+            collection "test"
+            _          (mc/insert db collection {:name "Clojure"})
+            check      (mc/count db collection)
+            _          (mdb/drop-db db)]
         (is (= 1 check))
-        (is (not (mc/exists? collection)))
-        (is (= 0 (mc/count collection))))))
+        (is (not (mc/exists? db collection)))
+        (is (= 0 (mc/count db collection))))))
 
-  (deftest test-use-database
-    (monger.core/use-db! "monger-test5")
-    (is (= "monger-test5" (.getName (monger.core/current-db))))
-    (let [collection "test"
-            _          (mc/insert collection {:name "Clojure"})
-            check      (mc/count collection)
-            _          (monger.db/drop-db)]
-        (is (= 1 check))
-        (is (not (mc/exists? collection)))
-        (is (= 0 (mc/count collection))))))
-
-
-(deftest test-get-collection-names
-  (mc/insert "test-1" {:name "Clojure"})
-  (mc/insert "test-2" {:name "Clojure"})
-  (let [^Set collections (monger.db/get-collection-names)]
-    (is (.contains collections "test-1"))
-    (is (.contains collections "test-2"))))
+  (deftest test-get-collection-names
+    (let [db (mg/get-db conn "monger-test")]
+      (mc/insert db "test-1" {:name "Clojure"})
+      (mc/insert db "test-2" {:name "Clojure"})
+      (let [^Set xs (mdb/get-collection-names db)]
+        (is (.contains xs "test-1"))
+        (is (.contains xs "test-2"))))))