Index: subversion/tests/cmdline/update_tests.py
===================================================================
--- subversion/tests/cmdline/update_tests.py	(revision 25470)
+++ subversion/tests/cmdline/update_tests.py	(working copy)
@@ -69,7 +69,7 @@
           return
 
   print "Found unexpected object:", node.name
-  raise svntest.main.SVNTreeUnequal
+  raise svntest.tree.SVNTreeUnequal
 
 
 
Index: subversion/tests/cmdline/svntest/main.py
===================================================================
--- subversion/tests/cmdline/svntest/main.py	(revision 25470)
+++ subversion/tests/cmdline/svntest/main.py	(working copy)
@@ -59,12 +59,6 @@
 #####################################################################
 # Global stuff
 
-### Grandfather in SVNTreeUnequal, which used to live here.  If you're
-# ever feeling saucy, you could go through the testsuite and change
-# main.SVNTreeUnequal to test.SVNTreeUnequal.
-import tree
-SVNTreeUnequal = tree.SVNTreeUnequal
-
 class SVNProcessTerminatedBySignal(Failure):
   "Exception raised if a spawned process segfaulted, aborted, etc."
   pass
Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py	(revision 25470)
+++ subversion/tests/cmdline/merge_tests.py	(working copy)
@@ -255,7 +255,7 @@
     "Accept expected tau.* singletons in a conflicting merge."
     if (not re.match("tau.*\.(r\d+|working)", a.name)):
       print "Merge got unexpected singleton", a.name
-      raise svntest.main.SVNTreeUnequal
+      raise svntest.tree.SVNTreeUnequal
 
   svntest.actions.run_and_verify_merge(other_wc, '1', '3',
                                        sbox.repo_url,