--- a/tests/test-revlog-ancestry.py	Tue Apr 05 23:23:43 2016 +0900
+++ b/tests/test-revlog-ancestry.py	Tue Apr 05 23:35:45 2016 +0900
@@ -3,10 +3,10 @@
 from mercurial import (
     hg,
     merge,
-    ui,
+    ui as uimod,
 )
 
-u = ui.ui()
+u = uimod.ui()
 
 repo = hg.repository(u, 'test1', create=1)
 os.chdir('test1')

--- a/tests/test-ui-verbosity.py	Tue Apr 05 23:23:43 2016 +0900
+++ b/tests/test-ui-verbosity.py	Tue Apr 05 23:35:45 2016 +0900
@@ -1,7 +1,9 @@
 from __future__ import absolute_import, print_function
 
 import os
-from mercurial import ui
+from mercurial import (
+    ui as uimod,
+)
 
 hgrc = os.environ['HGRCPATH']
 f = open(hgrc)
@@ -30,7 +32,7 @@
         f.write('debug = True\n')
     f.close()
 
-    u = ui.ui()
+    u = uimod.ui()
     if cmd_quiet or cmd_debug or cmd_verbose:
         u.setconfig('ui', 'quiet', str(bool(cmd_quiet)))
         u.setconfig('ui', 'verbose', str(bool(cmd_verbose)))