diff --git a/test/monger/test/atomic_modifiers.clj b/test/monger/test/atomic_modifiers_test.clj
similarity index 99%
rename from test/monger/test/atomic_modifiers.clj
rename to test/monger/test/atomic_modifiers_test.clj
index 5cb8c6c..3924b09 100644
--- a/test/monger/test/atomic_modifiers.clj
+++ b/test/monger/test/atomic_modifiers_test.clj
@@ -1,6 +1,6 @@
 (set! *warn-on-reflection* true)
 
-(ns monger.test.atomic-modifiers
+(ns monger.test.atomic-modifiers-test
   (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject CommandResult$CommandFailure]
             [org.bson.types ObjectId]
             [java.util Date])
diff --git a/test/monger/test/authentication.clj b/test/monger/test/authentication_test.clj
similarity index 94%
rename from test/monger/test/authentication.clj
rename to test/monger/test/authentication_test.clj
index 1813038..bc017f5 100644
--- a/test/monger/test/authentication.clj
+++ b/test/monger/test/authentication_test.clj
@@ -1,4 +1,4 @@
-(ns monger.test.authentication
+(ns monger.test.authentication-test
   (:require [monger core util db]
             [monger.test.helper :as helper])
   (:use [clojure.test]))
diff --git a/test/monger/test/cache.clj b/test/monger/test/cache_test.clj
similarity index 99%
rename from test/monger/test/cache.clj
rename to test/monger/test/cache_test.clj
index b39939d..85c9516 100644
--- a/test/monger/test/cache.clj
+++ b/test/monger/test/cache_test.clj
@@ -1,4 +1,4 @@
-(ns monger.test.cache
+(ns monger.test.cache-test
   (:require [monger.test.helper :as helper]
             [monger.collection  :as mc])
   (:use clojure.core.cache clojure.test monger.cache)
diff --git a/test/monger/test/collection.clj b/test/monger/test/collection_test.clj
similarity index 99%
rename from test/monger/test/collection.clj
rename to test/monger/test/collection_test.clj
index 65e6935..02c0893 100644
--- a/test/monger/test/collection.clj
+++ b/test/monger/test/collection_test.clj
@@ -1,6 +1,6 @@
 (set! *warn-on-reflection* true)
 
-(ns monger.test.collection
+(ns monger.test.collection-test
   (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject CommandResult$CommandFailure MapReduceOutput MapReduceCommand MapReduceCommand$OutputType]
             org.bson.types.ObjectId
             java.util.Date)
diff --git a/test/monger/test/command.clj b/test/monger/test/command_test.clj
similarity index 96%
rename from test/monger/test/command.clj
rename to test/monger/test/command_test.clj
index 749ec76..c395dec 100644
--- a/test/monger/test/command.clj
+++ b/test/monger/test/command_test.clj
@@ -1,9 +1,9 @@
-(ns monger.test.command
+(ns monger.test.command-test
   (:require [monger core command]
             [monger.test.helper :as helper]
             [monger.collection :as mgcol])
   (:import (com.mongodb Mongo DB CommandResult))
-  (:use [clojure.test]))
+  (:use clojure.test))
 
 (helper/connect!)
 
diff --git a/test/monger/test/conversion.clj b/test/monger/test/conversion_test.clj
similarity index 98%
rename from test/monger/test/conversion.clj
rename to test/monger/test/conversion_test.clj
index 945f4f5..8b76839 100644
--- a/test/monger/test/conversion.clj
+++ b/test/monger/test/conversion_test.clj
@@ -1,8 +1,8 @@
-(ns monger.test.conversion
+(ns monger.test.conversion-test
   (:require [monger core collection])
   (:import [com.mongodb DBObject BasicDBObject BasicDBList]
            [java.util Date Calendar List ArrayList]
-           [org.bson.types ObjectId])
+           org.bson.types.ObjectId)
   (:use clojure.test monger.conversion))
 
 
diff --git a/test/monger/test/core.clj b/test/monger/test/core_test.clj
similarity index 99%
rename from test/monger/test/core.clj
rename to test/monger/test/core_test.clj
index f875763..3304ebd 100644
--- a/test/monger/test/core.clj
+++ b/test/monger/test/core_test.clj
@@ -1,9 +1,9 @@
-(ns monger.test.core
+(ns monger.test.core-test
   (:require [monger core collection util result]
             [monger.test.helper :as helper]            
             [monger.collection :as mgcol])
   (:import [com.mongodb Mongo DB WriteConcern MongoOptions ServerAddress])
-  (:use [clojure.test]
+  (:use clojure.test
         [monger.core :only [server-address mongo-options]]))
 
 (println (str "Using Clojure version " *clojure-version*))
diff --git a/test/monger/test/db.clj b/test/monger/test/db_test.clj
similarity index 94%
rename from test/monger/test/db.clj
rename to test/monger/test/db_test.clj
index f6e3793..9fb8731 100644
--- a/test/monger/test/db.clj
+++ b/test/monger/test/db_test.clj
@@ -1,10 +1,10 @@
-(ns monger.test.db
+(ns monger.test.db-test
   (:require [monger core db]
             [monger.test.helper :as helper]
             [monger.collection :as mgcol])
   (:import [com.mongodb Mongo DB]
-           [java.util Set])
-  (:use [clojure.test]))
+           java.util.Set)
+  (:use clojure.test))
 
 (helper/connect!)
 
diff --git a/test/monger/test/factory_dsl.clj b/test/monger/test/factory_dsl_test.clj
similarity index 97%
rename from test/monger/test/factory_dsl.clj
rename to test/monger/test/factory_dsl_test.clj
index cf6c577..5424584 100644
--- a/test/monger/test/factory_dsl.clj
+++ b/test/monger/test/factory_dsl_test.clj
@@ -1,12 +1,12 @@
-(ns monger.test.factory-dsl
-  (:use     [clojure.test]
+(ns monger.test.factory-dsl-test
+  (:use     clojure.test
             [monger testkit joda-time]
-            [monger.test.fixtures]
+            monger.test.fixtures
             [clj-time.core :only [days ago weeks now]])
   (:require [monger.collection  :as mc]
             [monger.test.helper :as helper])
-  (:import [org.bson.types ObjectId]
-           [org.joda.time DateTime]))
+  (:import org.bson.types.ObjectId
+           org.joda.time.DateTime))
 
 
 (helper/connect!)
diff --git a/test/monger/test/gridfs.clj b/test/monger/test/gridfs_test.clj
similarity index 98%
rename from test/monger/test/gridfs.clj
rename to test/monger/test/gridfs_test.clj
index 20abe06..9710df3 100644
--- a/test/monger/test/gridfs.clj
+++ b/test/monger/test/gridfs_test.clj
@@ -1,8 +1,8 @@
-(ns monger.test.gridfs
+(ns monger.test.gridfs-test
   (:refer-clojure :exclude [count remove find])
-  (:use [clojure.test]
+  (:use clojure.test
         [monger.core :only [count]]
-        [monger.test.fixtures]
+        monger.test.fixtures
         [monger operators conversion]
         [monger.gridfs :only (store make-input-file)])
   (:require [monger.gridfs :as gridfs]
diff --git a/test/monger/test/indexing.clj b/test/monger/test/indexing_test.clj
similarity index 97%
rename from test/monger/test/indexing.clj
rename to test/monger/test/indexing_test.clj
index 250352c..495968e 100644
--- a/test/monger/test/indexing.clj
+++ b/test/monger/test/indexing_test.clj
@@ -1,4 +1,4 @@
-(ns monger.test.map-reduce
+(ns monger.test.indexing-test
   (:import  org.bson.types.ObjectId
             java.util.Date)
   (:require [monger core util]
diff --git a/test/monger/test/inserting.clj b/test/monger/test/inserting_test.clj
similarity index 95%
rename from test/monger/test/inserting.clj
rename to test/monger/test/inserting_test.clj
index 6538096..6d26ce8 100644
--- a/test/monger/test/inserting.clj
+++ b/test/monger/test/inserting_test.clj
@@ -1,17 +1,17 @@
 (set! *warn-on-reflection* true)
 
-(ns monger.test.inserting
+(ns monger.test.inserting-test
   (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject]
-            [org.bson.types ObjectId]
-            [java.util Date])
+            org.bson.types.ObjectId
+            java.util.Date)
   (:require [monger core util]
             [monger.collection :as mgcol]
             [monger.result     :as mgres]
             [monger.conversion :as mgcnv]
             [monger.test.helper :as helper])
-  (:use [clojure.test]
-        [monger.operators]
-        [monger.test.fixtures]))
+  (:use clojure.test
+        monger.operators
+        monger.test.fixtures))
 
 (helper/connect!)
 
diff --git a/test/monger/test/internal/fn.clj b/test/monger/test/internal/fn_test.clj
similarity index 94%
rename from test/monger/test/internal/fn.clj
rename to test/monger/test/internal/fn_test.clj
index 4d3f915..d999e9b 100644
--- a/test/monger/test/internal/fn.clj
+++ b/test/monger/test/internal/fn_test.clj
@@ -1,6 +1,6 @@
-(ns monger.test.internal.fn
-  (:use [clojure.test]
-        [monger.internal.fn]))
+(ns monger.test.internal.fn-test
+  (:use clojure.test
+        monger.internal.fn))
 
 
 (deftest test-expand-all
diff --git a/test/monger/test/internal/pagination.clj b/test/monger/test/internal/pagination_test.clj
similarity index 73%
rename from test/monger/test/internal/pagination.clj
rename to test/monger/test/internal/pagination_test.clj
index d687516..032fd8a 100644
--- a/test/monger/test/internal/pagination.clj
+++ b/test/monger/test/internal/pagination_test.clj
@@ -1,6 +1,6 @@
-(ns monger.test.internal.pagination
-  (:use [clojure.test]
-        [monger.internal.pagination]))
+(ns monger.test.internal.pagination-test
+  (:use clojure.test
+        monger.internal.pagination))
 
 (deftest test-pagination-offset
   (are [a b] (= a b)
diff --git a/test/monger/test/js.clj b/test/monger/test/js_test.clj
similarity index 79%
rename from test/monger/test/js.clj
rename to test/monger/test/js_test.clj
index a8cfd65..c788639 100644
--- a/test/monger/test/js.clj
+++ b/test/monger/test/js_test.clj
@@ -1,7 +1,7 @@
-(ns monger.test.js
-  (:require [monger js]
+(ns monger.test.js-test
+  (:require monger.js
             [monger.test.helper :as helper])
-  (:use [clojure.test]))
+  (:use clojure.test))
 
 (helper/connect!)
 
diff --git a/test/monger/test/lib_integration.clj b/test/monger/test/lib_integration_test.clj
similarity index 83%
rename from test/monger/test/lib_integration.clj
rename to test/monger/test/lib_integration_test.clj
index 297770a..aba2ca5 100644
--- a/test/monger/test/lib_integration.clj
+++ b/test/monger/test/lib_integration_test.clj
@@ -1,13 +1,13 @@
-(ns monger.test.lib-integration
-  (:use [clojure.test]
-        [monger.json]
-        [monger.joda-time]
-        [monger.conversion])
+(ns monger.test.lib-integration-test
+  (:use clojure.test
+        monger.json
+        monger.joda-time
+        monger.conversion)
   (:import [org.joda.time DateTime ReadableInstant]
            [org.joda.time.format ISODateTimeFormat]
            [java.io StringWriter PrintWriter]
-           [org.bson.types ObjectId]
-           [com.mongodb DBObject])
+           org.bson.types.ObjectId
+           com.mongodb.DBObject)
   (:require [clojure.data.json :as json]
             [clj-time.core     :as t]))
 
diff --git a/test/monger/test/map_reduce.clj b/test/monger/test/map_reduce_test.clj
similarity index 99%
rename from test/monger/test/map_reduce.clj
rename to test/monger/test/map_reduce_test.clj
index 7204fa8..de58b1f 100644
--- a/test/monger/test/map_reduce.clj
+++ b/test/monger/test/map_reduce_test.clj
@@ -1,4 +1,4 @@
-(ns monger.test.map-reduce
+(ns monger.test.map-reduce-test
   (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject CommandResult$CommandFailure MapReduceOutput MapReduceCommand MapReduceCommand$OutputType]
             org.bson.types.ObjectId
             java.util.Date)
diff --git a/test/monger/test/query_operators.clj b/test/monger/test/query_operators_test.clj
similarity index 97%
rename from test/monger/test/query_operators.clj
rename to test/monger/test/query_operators_test.clj
index 67c6b32..74cae52 100644
--- a/test/monger/test/query_operators.clj
+++ b/test/monger/test/query_operators_test.clj
@@ -1,9 +1,9 @@
 (set! *warn-on-reflection* true)
 
-(ns monger.test.query-operators
+(ns monger.test.query-operators-test
   (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject CommandResult$CommandFailure MapReduceOutput MapReduceCommand MapReduceCommand$OutputType]
-            [org.bson.types ObjectId]
-            [java.util Date])
+            org.bson.types.ObjectId
+            java.util.Date)
   (:require [monger core util]
             [clojure stacktrace]
             [monger.collection :as mgcol]
diff --git a/test/monger/test/querying.clj b/test/monger/test/querying_test.clj
similarity index 98%
rename from test/monger/test/querying.clj
rename to test/monger/test/querying_test.clj
index 7abfc43..7cede5e 100644
--- a/test/monger/test/querying.clj
+++ b/test/monger/test/querying_test.clj
@@ -1,16 +1,16 @@
 (set! *warn-on-reflection* true)
 
-(ns monger.test.querying
+(ns monger.test.querying-test
   (:refer-clojure :exclude [select find sort])
   (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject CommandResult$CommandFailure ReadPreference]
-            [org.bson.types ObjectId]
-            [java.util Date])
+            org.bson.types.ObjectId
+            java.util.Date)
   (:require [monger core util]
-            [monger.collection :as mgcol]
-            [monger.result     :as mgres]
+            [monger.collection  :as mgcol]
+            [monger.result      :as mgres]
             [monger.test.helper :as helper])
-  (:use [clojure.test]
-        [monger.test.fixtures]
+  (:use clojure.test
+        monger.test.fixtures
         [monger conversion query operators joda-time]
         [clj-time.core :only [date-time]]))
 
diff --git a/test/monger/test/regular_finders.clj b/test/monger/test/regular_finders_test.clj
similarity index 98%
rename from test/monger/test/regular_finders.clj
rename to test/monger/test/regular_finders_test.clj
index f5af0eb..6fbb7bb 100644
--- a/test/monger/test/regular_finders.clj
+++ b/test/monger/test/regular_finders_test.clj
@@ -1,17 +1,17 @@
 (set! *warn-on-reflection* true)
 
-(ns monger.test.regular-finders
+(ns monger.test.regular-finders-test
   (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject]
-            [org.bson.types ObjectId]
-            [java.util Date])
+            org.bson.types.ObjectId
+            java.util.Date)
   (:require [monger core util]
             [monger.collection :as mgcol]
             [monger.result     :as mgres]
             [monger.conversion :as mgcnv]
             [monger.test.helper :as helper])
-  (:use [clojure.test]
-        [monger.operators]
-        [monger.test.fixtures]))
+  (:use clojure.test
+        monger.operators
+        monger.test.fixtures))
 
 (helper/connect!)
 
diff --git a/test/monger/test/result.clj b/test/monger/test/result_test.clj
similarity index 95%
rename from test/monger/test/result.clj
rename to test/monger/test/result_test.clj
index 272c6e4..b660a60 100644
--- a/test/monger/test/result.clj
+++ b/test/monger/test/result_test.clj
@@ -1,8 +1,8 @@
-(ns monger.test.result
-  (:import (com.mongodb BasicDBObject WriteResult WriteConcern) (java.util Date))
+(ns monger.test.result-test
+  (:import [com.mongodb BasicDBObject WriteResult WriteConcern] java.util.Date)
   (:require [monger core collection conversion]
             [monger.test.helper :as helper])
-  (:use [clojure.test]))
+  (:use clojure.test))
 
 (helper/connect!)
 
diff --git a/test/monger/test/stress.clj b/test/monger/test/stress_test.clj
similarity index 90%
rename from test/monger/test/stress.clj
rename to test/monger/test/stress_test.clj
index 9efd301..55b2759 100644
--- a/test/monger/test/stress.clj
+++ b/test/monger/test/stress_test.clj
@@ -1,9 +1,9 @@
-(ns monger.test.stress
+(ns monger.test.stress-test
   (:import [com.mongodb Mongo DB DBCollection WriteResult DBObject WriteConcern DBCursor]
-           [java.util Date])
-  (:require [monger core]
+           java.util.Date)
+  (:require monger.core
             [monger.test.helper :as helper])
-  (:use     [clojure.test]))
+  (:use     clojure.test))
 
 
 ;;
diff --git a/test/monger/test/updating.clj b/test/monger/test/updating_test.clj
similarity index 96%
rename from test/monger/test/updating.clj
rename to test/monger/test/updating_test.clj
index 475e498..f039dd5 100644
--- a/test/monger/test/updating.clj
+++ b/test/monger/test/updating_test.clj
@@ -1,17 +1,17 @@
 (set! *warn-on-reflection* true)
 
-(ns monger.test.updating
+(ns monger.test.updating-test
   (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject]
-            [org.bson.types ObjectId]
-            [java.util Date])
+            org.bson.types.ObjectId
+            java.util.Date)
   (:require [monger core util]
             [monger.collection :as mgcol]
             [monger.result     :as mgres]
             [monger.conversion :as mgcnv]
             [monger.test.helper :as helper])
-  (:use [clojure.test]
-        [monger.operators]
-        [monger.test.fixtures]))
+  (:use clojure.test
+        monger.operators
+        monger.test.fixtures))
 
 (helper/connect!)
 
diff --git a/test/monger/test/util.clj b/test/monger/test/util_test.clj
similarity index 79%
rename from test/monger/test/util.clj
rename to test/monger/test/util_test.clj
index 4e3e0d2..0570248 100644
--- a/test/monger/test/util.clj
+++ b/test/monger/test/util_test.clj
@@ -1,7 +1,7 @@
-(ns monger.test.util
-  (:import (com.mongodb DBObject))
+(ns monger.test.util-test
+  (:import com.mongodb.DBObject)
   (:require [monger util conversion])
-  (:use [clojure.test]))
+  (:use clojure.test))
 
 
 (deftest get-object-id