3 files changed, 10 insertions, 8 deletions
diff --git a/src/clojure/contrib/test_contrib.clj b/src/clojure/contrib/test_contrib.clj
index 47361c92..f5cf44ea 100644
--- a/src/clojure/contrib/test_contrib.clj
+++ b/src/clojure/contrib/test_contrib.clj
@@ -16,9 +16,11 @@
   (:use [clojure.contrib.test-is :only (run-tests)])
   (:gen-class))
 
-(def test-names [:complex-numbers :macro-utils :monads :pprint.pretty :pprint.cl-format
-                 :str-utils :shell-out :test-graph :test-dataflow :test-java-utils
-		 :test-lazy-seqs])
+(def test-names
+     [:complex-numbers :fnmap :macro-utils :monads :pprint.pretty
+      :pprint.cl-format :str-utils :shell-out :test-graph
+      :test-dataflow :test-java-utils :test-lazy-seqs :test-is
+      :test-is-fixtures])
 
 (def test-namespaces
      (map #(symbol (str "clojure.contrib.test-contrib." (name %)))
diff --git a/src/clojure/contrib/test_is/tests.clj b/src/clojure/contrib/test_contrib/test_is.clj
index 60fee95e..f9e77d76 100644
--- a/src/clojure/contrib/test_is/tests.clj
+++ b/src/clojure/contrib/test_contrib/test_is.clj
@@ -1,4 +1,4 @@
-;;; test_is/tests.clj: unit tests for test_is.clj
+;;; test_contrib/test_is.clj: unit tests for test_is.clj
 
 ;; by Stuart Sierra, http://stuartsierra.com/
 ;; January 16, 2009
@@ -15,7 +15,7 @@
 ;; remove this notice, or any other, from this software.
 
 
-(ns clojure.contrib.test-is.tests
+(ns clojure.contrib.test-contrib.test-is
   (:use clojure.contrib.test-is))
 
 (deftest can-test-symbol
@@ -110,4 +110,4 @@
 (defn test-ns-hook []
   (binding [original-report report
             report custom-report]
-    (test-all-vars (find-ns 'clojure.contrib.test-is.tests))))
+    (test-all-vars (find-ns 'clojure.contrib.test-contrib.test-is))))
diff --git a/src/clojure/contrib/test_is/test_fixtures.clj b/src/clojure/contrib/test_contrib/test_is_fixtures.clj
index a583f5a5..218c45d5 100644
--- a/src/clojure/contrib/test_is/test_fixtures.clj
+++ b/src/clojure/contrib/test_contrib/test_is_fixtures.clj
@@ -1,4 +1,4 @@
-;;; test_is/test_fixtures.clj: unit tests for fixtures in test_is.clj
+;;; test_is_fixtures.clj: unit tests for fixtures in test_is.clj
 
 ;; by Stuart Sierra, http://stuartsierra.com/
 ;; March 28, 2009
@@ -12,7 +12,7 @@
 ;; remove this notice, or any other, from this software.
 
 
-(ns clojure.contrib.test-is.test-fixtures
+(ns clojure.contrib.test-contrib.test-is-fixtures
   (:use clojure.contrib.test-is))
 
 (declare *a* *b* *c* *d*)