34 files changed, 90 insertions, 90 deletions
diff --git a/build.xml b/build.xml
index 82d9c8ac..8c90a2da 100644
--- a/build.xml
+++ b/build.xml
@@ -93,11 +93,11 @@
       <arg value="clojure.xml"/>
       <arg value="clojure.zip"/>
       <arg value="clojure.inspector"/>
-      <arg value="clojure.contrib.walk"/>
-      <arg value="clojure.contrib.stacktrace"/>
-      <arg value="clojure.contrib.template"/>
-      <arg value="clojure.contrib.test-is"/>
-      <arg value="clojure.contrib.test-is.tap"/>
+      <arg value="clojure.walk"/>
+      <arg value="clojure.stacktrace"/>
+      <arg value="clojure.template"/>
+      <arg value="clojure.test"/>
+      <arg value="clojure.test.tap"/>
     </java>
   </target>
 
@@ -125,7 +125,7 @@
         <path location="${clojure_jar}"/>
       </classpath>
       <arg value="-e"/>
-      <arg value="(require '(clojure.contrib [test-clojure :as main])) (main/run)"/>
+      <arg value="(require '(clojure [test-clojure :as main])) (main/run)"/>
     </java>
   </target>
 
diff --git a/src/clj/clojure/contrib/stacktrace.clj b/src/clj/clojure/stacktrace.clj
index 7330ef47..fcdf47f8 100644
--- a/src/clj/clojure/contrib/stacktrace.clj
+++ b/src/clj/clojure/stacktrace.clj
@@ -15,7 +15,7 @@
 (ns 
   #^{:author "Stuart Sierra",
      :doc "Print Clojure-centric stack traces"}
-  clojure.contrib.stacktrace)
+  clojure.stacktrace)
 
 (defn root-cause
   "Returns the last 'cause' Throwable in a chain of Throwables."
diff --git a/src/clj/clojure/contrib/template.clj b/src/clj/clojure/template.clj
index 748ad4a4..2515b04e 100644
--- a/src/clj/clojure/contrib/template.clj
+++ b/src/clj/clojure/template.clj
@@ -24,8 +24,8 @@
 
 (ns #^{:author "Stuart Sierra"
        :doc "Macros that expand to repeated copies of a template expression."}
-  clojure.contrib.template
-  (:require [clojure.contrib.walk :as walk]))
+  clojure.template
+  (:require [clojure.walk :as walk]))
 
 (defn apply-template
   "For use in macros.  argv is an argument list, as in defn.  expr is
diff --git a/src/clj/clojure/contrib/test_is.clj b/src/clj/clojure/test.clj
index 8138ce3e..601d2b4d 100644
--- a/src/clj/clojure/contrib/test_is.clj
+++ b/src/clj/clojure/test.clj
@@ -455,9 +455,9 @@ Chas Emerick, Allen Rohner, and Stuart Halloway",
 
    For additional event types, see the examples in the code.
 "}
-  clojure.contrib.test-is
-  (:require [clojure.contrib.template :as temp]
-            [clojure.contrib.stacktrace :as stack]))
+  clojure.test
+  (:require [clojure.template :as temp]
+            [clojure.stacktrace :as stack]))
 
 ;; Nothing is marked "private" here, so you can rebind things to plug
 ;; in your own testing or reporting frameworks.
@@ -746,7 +746,7 @@ Chas Emerick, Allen Rohner, and Stuart Halloway",
 
 (defmacro are
   "Checks multiple assertions with a template expression.
-  See clojure.contrib.template/do-template for an explanation of
+  See clojure.template/do-template for an explanation of
   templates.
 
   Example: (are [x y] (= x y)  
diff --git a/src/clj/clojure/contrib/test_is/tap.clj b/src/clj/clojure/test/tap.clj
index 47310d15..5963b1b9 100644
--- a/src/clj/clojure/contrib/test_is/tap.clj
+++ b/src/clj/clojure/test/tap.clj
@@ -1,4 +1,4 @@
-;;; test_is/tap.clj: Extension to test-is for TAP output
+;;; test_is/tap.clj: Extension to test for TAP output
 
 ;; by Stuart Sierra, http://stuartsierra.com/
 ;; March 31, 2009
@@ -18,7 +18,7 @@
 
 ;; DOCUMENTATION
 ;;
-;; This is an extension to clojure.contrib.test-is that adds support
+;; This is an extension to clojure.test that adds support
 ;; for the Test Anything Protocol (TAP).  
 ;;
 ;; TAP is a simple text-based syntax for reporting test results.  TAP
@@ -28,20 +28,20 @@
 ;; http://search.cpan.org/~petdance/TAP-1.0.0/TAP.pm
 ;;
 ;; To use this library, wrap any calls to
-;; clojure.contrib.test-is/run-tests in the with-tap-output macro,
+;; clojure.test/run-tests in the with-tap-output macro,
 ;; like this:
 ;;
-;;   (use 'clojure.contrib.test-is)
-;;   (use 'clojure.contrib.test-is.tap)
+;;   (use 'clojure.test)
+;;   (use 'clojure.test.tap)
 ;;
 ;;   (with-tap-output
 ;;    (run-tests 'my.cool.library))
 
 
 
-(ns clojure.contrib.test-is.tap
-  (:require [clojure.contrib.test-is :as t]
-            [clojure.contrib.stacktrace :as stack]))
+(ns clojure.test.tap
+  (:require [clojure.test :as t]
+            [clojure.stacktrace :as stack]))
 
 (defn print-tap-plan
   "Prints a TAP plan line like '1..n'.  n is the number of tests"
@@ -65,7 +65,7 @@
   [msg]
   (println "not ok" msg))
 
-;; This multimethod will override test-is/report
+;; This multimethod will override test/report
 (defmulti tap-report (fn [data] (:type data)))
 
 (defmethod tap-report :default [data]
@@ -105,7 +105,7 @@
 
 
 (defmacro with-tap-output
-  "Execute body with modified test-is reporting functions that produce
+  "Execute body with modified test reporting functions that produce
   TAP output"
   [& body]
   `(binding [t/report tap-report]
diff --git a/src/clj/clojure/contrib/walk.clj b/src/clj/clojure/walk.clj
index 525fe5a7..52927ca1 100644
--- a/src/clj/clojure/contrib/walk.clj
+++ b/src/clj/clojure/walk.clj
@@ -42,7 +42,7 @@ the examples.
 Note: \"walk\" supports all Clojure data structures EXCEPT maps
 created with sorted-map-by.  There is no (obvious) way to retrieve
 the sorting function."}
-  clojure.contrib.walk)
+  clojure.walk)
 
 (defn walk
   "Traverses form, an arbitrary data structure.  inner and outer are
diff --git a/test/clojure/contrib/test_clojure.clj b/test/clojure/test_clojure.clj
index b524becc..387c185d 100644
--- a/test/clojure/contrib/test_clojure.clj
+++ b/test/clojure/test_clojure.clj
@@ -6,15 +6,15 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 ;;
-;;  clojure.contrib.test-clojure
+;;  clojure.test-clojure
 ;;
 ;;  Tests for the facilities provided by Clojure
 ;;
 ;;  scgilardi (gmail)
 ;;  Created 22 October 2008
 
-(ns clojure.contrib.test-clojure
-  (:use [clojure.contrib.test-is :only (run-tests)])
+(ns clojure.test-clojure
+  (:use [clojure.test :only (run-tests)])
   (:gen-class))
 
 (def test-names
@@ -48,7 +48,7 @@
       ])
 
 (def test-namespaces
-     (map #(symbol (str "clojure.contrib.test-clojure." (name %)))
+     (map #(symbol (str "clojure.test-clojure." (name %)))
           test-names))
 
 (defn run
diff --git a/test/clojure/contrib/test_clojure/agents.clj b/test/clojure/test_clojure/agents.clj
index 34dfb2a1..044e68ee 100644
--- a/test/clojure/contrib/test_clojure/agents.clj
+++ b/test/clojure/test_clojure/agents.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.agents
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.agents
+  (:use clojure.test))
 
 (deftest handle-all-throwables-during-agent-actions
   ;; Bug fixed in r1198; previously hung Clojure or didn't report agent errors
diff --git a/test/clojure/contrib/test_clojure/atoms.clj b/test/clojure/test_clojure/atoms.clj
index 0b0dbd91..7ac36fcc 100644
--- a/test/clojure/contrib/test_clojure/atoms.clj
+++ b/test/clojure/test_clojure/atoms.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.atoms
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.atoms
+  (:use clojure.test))
 
 ; http://clojure.org/atoms
 
diff --git a/test/clojure/contrib/test_clojure/clojure_set.clj b/test/clojure/test_clojure/clojure_set.clj
index 3e698406..9faf3410 100644
--- a/test/clojure/contrib/test_clojure/clojure_set.clj
+++ b/test/clojure/test_clojure/clojure_set.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.clojure-set
-  (:use clojure.contrib.test-is)
+(ns clojure.test-clojure.clojure-set
+  (:use clojure.test)
   (:require [clojure.set :as set]))
 
 
diff --git a/test/clojure/contrib/test_clojure/clojure_xml.clj b/test/clojure/test_clojure/clojure_xml.clj
index ebcddc81..b9ab0829 100644
--- a/test/clojure/contrib/test_clojure/clojure_xml.clj
+++ b/test/clojure/test_clojure/clojure_xml.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.clojure-xml
-  (:use clojure.contrib.test-is)
+(ns clojure.test-clojure.clojure-xml
+  (:use clojure.test)
   (:require [clojure.xml :as xml]))
 
 
diff --git a/test/clojure/contrib/test_clojure/clojure_zip.clj b/test/clojure/test_clojure/clojure_zip.clj
index b400c863..b3e53e95 100644
--- a/test/clojure/contrib/test_clojure/clojure_zip.clj
+++ b/test/clojure/test_clojure/clojure_zip.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.clojure-zip
-  (:use clojure.contrib.test-is)
+(ns clojure.test-clojure.clojure-zip
+  (:use clojure.test)
   (:require [clojure.zip :as zip]))
 
 
diff --git a/test/clojure/contrib/test_clojure/compilation.clj b/test/clojure/test_clojure/compilation.clj
index d3e59a7a..03557033 100644
--- a/test/clojure/contrib/test_clojure/compilation.clj
+++ b/test/clojure/test_clojure/compilation.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.compilation
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.compilation
+  (:use clojure.test))
 
 ; http://clojure.org/compilation
 
diff --git a/test/clojure/contrib/test_clojure/control.clj b/test/clojure/test_clojure/control.clj
index 79bf93fb..0b29e205 100644
--- a/test/clojure/contrib/test_clojure/control.clj
+++ b/test/clojure/test_clojure/control.clj
@@ -9,9 +9,9 @@
 ;;  Test "flow control" constructs.
 ;;
 
-(ns clojure.contrib.test-clojure.control
-  (:use clojure.contrib.test-is
-        [clojure.contrib.test-clojure.test-utils :only (exception)]))
+(ns clojure.test-clojure.control
+  (:use clojure.test
+        [clojure.test-clojure.test-utils :only (exception)]))
 
 ;; *** Helper functions ***
 
diff --git a/test/clojure/contrib/test_clojure/data_structures.clj b/test/clojure/test_clojure/data_structures.clj
index 8faa7680..edca3955 100644
--- a/test/clojure/contrib/test_clojure/data_structures.clj
+++ b/test/clojure/test_clojure/data_structures.clj
@@ -7,8 +7,8 @@
 ;;  from this software.
 ;;
 
-(ns clojure.contrib.test-clojure.data-structures
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.data-structures
+  (:use clojure.test))
 
 
 ;; *** Helper functions ***
diff --git a/test/clojure/contrib/test_clojure/evaluation.clj b/test/clojure/test_clojure/evaluation.clj
index fdd84bba..040daa34 100644
--- a/test/clojure/contrib/test_clojure/evaluation.clj
+++ b/test/clojure/test_clojure/evaluation.clj
@@ -6,7 +6,7 @@
 ;;  this license. You must not remove this notice, or any other, from this
 ;;  software.
 ;;
-;;  clojure.contrib.test-clojure.evaluation.clj
+;;  clojure.test-clojure.evaluation.clj
 ;;
 ;;  Tests for the Clojure functions documented at the URL:
 ;;
@@ -15,21 +15,21 @@
 ;;  by J. McConnell, http://ubermenschconsulting.com
 ;;  Created 22 October 2008
 
-(ns clojure.contrib.test-clojure.evaluation
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.evaluation
+  (:use clojure.test))
 
 (import '(java.lang Boolean)
         '(clojure.lang Compiler Compiler$CompilerException))
 
 (defmacro test-that
   "Provides a useful way for specifying the purpose of tests. If the first-level
-  forms are lists that make a call to a test-is function, it supplies the
+  forms are lists that make a call to a clojure.test function, it supplies the
   purpose as the msg argument to those functions. Otherwise, the purpose just
   acts like a comment and the forms are run unchanged."
   [purpose & test-forms]
   (let [tests (map
                 #(if (= (:ns (meta (resolve (first %))))
-                        (the-ns 'clojure.contrib.test-is))
+                        (the-ns 'clojure.test))
                    (concat % (list purpose))
                    %)
                 test-forms)]
@@ -50,7 +50,7 @@
 
 (defmacro in-test-ns [& body]
   `(binding [*ns* *ns*]
-     (in-ns 'clojure.contrib.test-clojure.evaluation)
+     (in-ns 'clojure.test-clojure.evaluation)
      ~@body))
 
 ;;; Literals tests ;;;
@@ -86,7 +86,7 @@
 (in-ns 'resolution-test)
 (def bar 123)
 (def #^{:private true} baz 456)
-(in-ns 'clojure.contrib.test-clojure.evaluation)
+(in-ns 'clojure.test-clojure.evaluation)
 
 (defn a-match? [re s] (not (nil? (re-matches re s))))
 
diff --git a/test/clojure/contrib/test_clojure/for.clj b/test/clojure/test_clojure/for.clj
index 1b3dcb4d..ab3221a2 100644
--- a/test/clojure/contrib/test_clojure/for.clj
+++ b/test/clojure/test_clojure/for.clj
@@ -11,8 +11,8 @@
 ;;  by Chouser, http://chouser.n01se.net
 ;;  Created Dec 2008
 
-(ns clojure.contrib.test-clojure.for
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.for
+  (:use clojure.test))
 
 (deftest Docstring-Example
   (is (= (take 100 (for [x (range 100000000)
diff --git a/test/clojure/contrib/test_clojure/java_interop.clj b/test/clojure/test_clojure/java_interop.clj
index 8c040255..66ae8a7e 100644
--- a/test/clojure/contrib/test_clojure/java_interop.clj
+++ b/test/clojure/test_clojure/java_interop.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.java-interop
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.java-interop
+  (:use clojure.test))
 
 ; http://clojure.org/java_interop
 ; http://clojure.org/compilation
diff --git a/test/clojure/contrib/test_clojure/logic.clj b/test/clojure/test_clojure/logic.clj
index 6c46b711..cab5675e 100644
--- a/test/clojure/contrib/test_clojure/logic.clj
+++ b/test/clojure/test_clojure/logic.clj
@@ -8,9 +8,9 @@
 ;;
 ;;  Created 1/29/2009
 
-(ns clojure.contrib.test-clojure.logic
-  (:use clojure.contrib.test-is
-        [clojure.contrib.test-clojure.test-utils :only (exception)]))
+(ns clojure.test-clojure.logic
+  (:use clojure.test
+        [clojure.test-clojure.test-utils :only (exception)]))
 
 
 ;; *** Tests ***
diff --git a/test/clojure/contrib/test_clojure/macros.clj b/test/clojure/test_clojure/macros.clj
index 40fd99ba..71af3034 100644
--- a/test/clojure/contrib/test_clojure/macros.clj
+++ b/test/clojure/test_clojure/macros.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.macros
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.macros
+  (:use clojure.test))
 
 ; http://clojure.org/macros
 
diff --git a/test/clojure/contrib/test_clojure/metadata.clj b/test/clojure/test_clojure/metadata.clj
index ea0cdbe1..7c1c100c 100644
--- a/test/clojure/contrib/test_clojure/metadata.clj
+++ b/test/clojure/test_clojure/metadata.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.metadata
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.metadata
+  (:use clojure.test))
 
 
 ; http://clojure.org/metadata
diff --git a/test/clojure/contrib/test_clojure/multimethods.clj b/test/clojure/test_clojure/multimethods.clj
index b273a0bd..18774d2e 100644
--- a/test/clojure/contrib/test_clojure/multimethods.clj
+++ b/test/clojure/test_clojure/multimethods.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.multimethods
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.multimethods
+  (:use clojure.test))
 
 ; http://clojure.org/multimethods
 
diff --git a/test/clojure/contrib/test_clojure/ns_libs.clj b/test/clojure/test_clojure/ns_libs.clj
index 50822d46..a487396e 100644
--- a/test/clojure/contrib/test_clojure/ns_libs.clj
+++ b/test/clojure/test_clojure/ns_libs.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.ns-libs
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.ns-libs
+  (:use clojure.test))
 
 ; http://clojure.org/namespaces
 
diff --git a/test/clojure/contrib/test_clojure/numbers.clj b/test/clojure/test_clojure/numbers.clj
index aa480d7c..d4462aa0 100644
--- a/test/clojure/contrib/test_clojure/numbers.clj
+++ b/test/clojure/test_clojure/numbers.clj
@@ -10,8 +10,8 @@
 ;;  Created 30 October 2008
 ;;
 
-(ns clojure.contrib.test-clojure.numbers
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.numbers
+  (:use clojure.test))
 
 
 ; TODO:
diff --git a/test/clojure/contrib/test_clojure/other_functions.clj b/test/clojure/test_clojure/other_functions.clj
index 17b1f3b8..131b854a 100644
--- a/test/clojure/contrib/test_clojure/other_functions.clj
+++ b/test/clojure/test_clojure/other_functions.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.other-functions
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.other-functions
+  (:use clojure.test))
 
 ; http://clojure.org/other_functions
 
diff --git a/test/clojure/contrib/test_clojure/parallel.clj b/test/clojure/test_clojure/parallel.clj
index 855e507b..e97662d3 100644
--- a/test/clojure/contrib/test_clojure/parallel.clj
+++ b/test/clojure/test_clojure/parallel.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.parallel
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.parallel
+  (:use clojure.test))
 
 ;; !! Tests for the parallel library will be in a separate file clojure_parallel.clj !!
 
diff --git a/test/clojure/contrib/test_clojure/predicates.clj b/test/clojure/test_clojure/predicates.clj
index 0206860d..5d140315 100644
--- a/test/clojure/contrib/test_clojure/predicates.clj
+++ b/test/clojure/test_clojure/predicates.clj
@@ -8,8 +8,8 @@
 ;;
 ;;  Created 1/28/2009
 
-(ns clojure.contrib.test-clojure.predicates
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.predicates
+  (:use clojure.test))
 
 
 ;; *** Type predicates ***
diff --git a/test/clojure/contrib/test_clojure/printer.clj b/test/clojure/test_clojure/printer.clj
index 4e307099..47cac01b 100644
--- a/test/clojure/contrib/test_clojure/printer.clj
+++ b/test/clojure/test_clojure/printer.clj
@@ -6,13 +6,13 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 ;;
-;;  clojure.contrib.test-clojure.printer
+;;  clojure.test-clojure.printer
 ;;
 ;;  scgilardi (gmail)
 ;;  Created 29 October 2008
 
-(ns clojure.contrib.test-clojure.printer
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.printer
+  (:use clojure.test))
 
 (deftest print-length-empty-seq
   (let [coll () val "()"]
diff --git a/test/clojure/contrib/test_clojure/reader.clj b/test/clojure/test_clojure/reader.clj
index 3c771934..c28f4035 100644
--- a/test/clojure/contrib/test_clojure/reader.clj
+++ b/test/clojure/test_clojure/reader.clj
@@ -13,8 +13,8 @@
 ;;  scgilardi (gmail)
 ;;  Created 22 October 2008
 
-(ns clojure.contrib.test-clojure.reader
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.reader
+  (:use clojure.test))
 
 ;; Symbols
 
diff --git a/test/clojure/contrib/test_clojure/refs.clj b/test/clojure/test_clojure/refs.clj
index dcc43cc4..b9f44158 100644
--- a/test/clojure/contrib/test_clojure/refs.clj
+++ b/test/clojure/test_clojure/refs.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.refs
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.refs
+  (:use clojure.test))
 
 ; http://clojure.org/refs
 
diff --git a/test/clojure/contrib/test_clojure/sequences.clj b/test/clojure/test_clojure/sequences.clj
index 762e157a..128be6f7 100644
--- a/test/clojure/contrib/test_clojure/sequences.clj
+++ b/test/clojure/test_clojure/sequences.clj
@@ -7,8 +7,8 @@
 ;;  from this software.
 ;;
 
-(ns clojure.contrib.test-clojure.sequences
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.sequences
+  (:use clojure.test))
 
 
 ;; *** Tests ***
diff --git a/test/clojure/contrib/test_clojure/special.clj b/test/clojure/test_clojure/special.clj
index 298ef534..1b4cc6fd 100644
--- a/test/clojure/contrib/test_clojure/special.clj
+++ b/test/clojure/test_clojure/special.clj
@@ -9,8 +9,8 @@
 ;;  Test special forms, macros and metadata
 ;;
 
-(ns clojure.contrib.test-clojure.special
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.special
+  (:use clojure.test))
 
 ; http://clojure.org/special_forms
 
diff --git a/test/clojure/contrib/test_clojure/test_utils.clj b/test/clojure/test_clojure/test_utils.clj
index 25ba6bd9..ba44f18f 100644
--- a/test/clojure/contrib/test_clojure/test_utils.clj
+++ b/test/clojure/test_clojure/test_utils.clj
@@ -6,7 +6,7 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.test-utils)
+(ns clojure.test-clojure.test-utils)
 
   (defn exception
     "Use this function to ensure that execution of a program doesn't
@@ -26,5 +26,5 @@
 ;;     (is (= b c)))"
 ;;     [expr & args]
 ;;     (concat
-;;      (list 'clojure.contrib.template/do-template (list 'clojure.contrib.test-is/is expr))
+;;      (list 'clojure.contrib.template/do-template (list 'clojure.test/is expr))
 ;;      (apply concat (combinations args 2)))))
diff --git a/test/clojure/contrib/test_clojure/vars.clj b/test/clojure/test_clojure/vars.clj
index f3b2e8ff..233edd1a 100644
--- a/test/clojure/contrib/test_clojure/vars.clj
+++ b/test/clojure/test_clojure/vars.clj
@@ -6,8 +6,8 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.vars
-  (:use clojure.contrib.test-is))
+(ns clojure.test-clojure.vars
+  (:use clojure.test))
 
 ; http://clojure.org/vars