diff --git a/test/monger/test/atomic_modifiers.clj b/test/monger/test/atomic_modifiers.clj
index 0a12997..32d44ae 100644
--- a/test/monger/test/atomic_modifiers.clj
+++ b/test/monger/test/atomic_modifiers.clj
@@ -13,12 +13,7 @@
         [monger.operators]
         [monger.test.fixtures]))
 
-(defn purge-scores-collection
-  [f]
-  (purge-collection "scores" f))
-
-
-(use-fixtures :each purge-docs-collection purge-things-collection purge-scores-collection)
+(use-fixtures :each purge-docs purge-things purge-scores)
 
 (monger.core/set-default-write-concern! WriteConcern/SAFE)
 
diff --git a/test/monger/test/collection.clj b/test/monger/test/collection.clj
index 9e5012f..4aee263 100644
--- a/test/monger/test/collection.clj
+++ b/test/monger/test/collection.clj
@@ -19,7 +19,7 @@
 
 
 
-(use-fixtures :each purge-people-collection purge-docs-collection purge-things-collection purge-libraries-collection)
+(use-fixtures :each purge-people purge-docs purge-things purge-libraries)
 
 (monger.core/set-default-write-concern! WriteConcern/SAFE)
 
diff --git a/test/monger/test/fixtures.clj b/test/monger/test/fixtures.clj
index de6e721..db089f5 100644
--- a/test/monger/test/fixtures.clj
+++ b/test/monger/test/fixtures.clj
@@ -1,28 +1,14 @@
 (ns monger.test.fixtures
-  (:require [monger.collection :as mgcol]))
+  (:require [monger.collection :as mgcol])
+  (:use     [monger.testing]))
 
 ;;
 ;; fixture functions
 ;;
 
-(defn purge-collection
-  [collection-name, f]
-  (mgcol/remove collection-name)
-  (f)
-  (mgcol/remove collection-name))
-
-(defn purge-people-collection
-  [f]
-  (purge-collection "people" f))
-
-(defn purge-docs-collection
-  [f]
-  (purge-collection "docs" f))
-
-(defn purge-things-collection
-  [f]
-  (purge-collection "things" f))
-
-(defn purge-libraries-collection
-  [f]
-  (purge-collection "libraries" f))
+(defcleaner people    "people")
+(defcleaner docs      "docs")
+(defcleaner things    "things")
+(defcleaner libraries "libraries")
+(defcleaner scores    "scores")
+(defcleaner locations "locations")
\ No newline at end of file
diff --git a/test/monger/test/query_operators.clj b/test/monger/test/query_operators.clj
index 8268c45..89239e1 100644
--- a/test/monger/test/query_operators.clj
+++ b/test/monger/test/query_operators.clj
@@ -19,7 +19,7 @@
 
 
 
-(use-fixtures :each purge-people-collection purge-docs-collection purge-things-collection purge-libraries-collection)
+(use-fixtures :each purge-people purge-docs purge-things purge-libraries)
 
 (monger.core/set-default-write-concern! WriteConcern/SAFE)
 
diff --git a/test/monger/test/querying.clj b/test/monger/test/querying.clj
index d3a5c88..0247c37 100644
--- a/test/monger/test/querying.clj
+++ b/test/monger/test/querying.clj
@@ -13,11 +13,7 @@
         [monger conversion query operators]))
 
 
-(defn purge-locations-collection
-  [f]
-  (purge-collection "locations" f))
-
-(use-fixtures :each purge-docs-collection purge-things-collection purge-locations-collection)
+(use-fixtures :each purge-docs purge-things purge-locations)
 
 (monger.core/set-default-write-concern! WriteConcern/SAFE)