3 files changed, 6 insertions, 6 deletions
diff --git a/src/clojure/contrib/load_all.clj b/src/clojure/contrib/load_all.clj
index b3cc9425..2137ad2c 100644
--- a/src/clojure/contrib/load_all.clj
+++ b/src/clojure/contrib/load_all.clj
@@ -81,6 +81,7 @@ test-is.tests
 test-clojure
 test-clojure.agents
 test-clojure.atoms
+test-clojure.clojure-main
 test-clojure.clojure-set
 test-clojure.clojure-xml
 test-clojure.clojure-zip
@@ -90,7 +91,6 @@ test-clojure.evaluation
 test-clojure.for
 test-clojure.java-interop
 test-clojure.logic
-test-clojure.main
 test-clojure.multimethods
 test-clojure.ns-libs
 test-clojure.numbers
diff --git a/src/clojure/contrib/test_clojure.clj b/src/clojure/contrib/test_clojure.clj
index b2e676f6..c241ea26 100644
--- a/src/clojure/contrib/test_clojure.clj
+++ b/src/clojure/contrib/test_clojure.clj
@@ -37,8 +37,8 @@
       :agents
       :atoms
       :java-interop
-      :main
       ;; libraries
+      :clojure-main
       :clojure-set
       :clojure-xml
       :clojure-zip
diff --git a/src/clojure/contrib/test_clojure/main.clj b/src/clojure/contrib/test_clojure/clojure_main.clj
index c3e6f48a..80629a3d 100644
--- a/src/clojure/contrib/test_clojure/main.clj
+++ b/src/clojure/contrib/test_clojure/clojure_main.clj
@@ -6,9 +6,9 @@
 ;;  terms of this license.  You must not remove this notice, or any other,
 ;;  from this software.
 
-(ns clojure.contrib.test-clojure.main
-  (:use clojure.contrib.test-is
-        clojure.main))
+(ns clojure.contrib.test-clojure.clojure-main
+  (:use clojure.contrib.test-is)
+  (:require [clojure.main :as main]))
 
 (defn- set-properties
   [settings]
@@ -36,5 +36,5 @@
 (deftest compile-path-respects-java-property
   ;; Bug fixed in r1177; previously was hardwired to the compile-time path.
   (with-properties ["clojure.compile.path" "compile path test"]
-    (with-bindings
+    (main/with-bindings
       (is (= "compile path test" *compile-path*)))))