diff -r 867d6ba2353d -r b4048ce003fb tests/test-trusted.py
--- a/tests/test-trusted.py	Sun Mar 27 20:31:56 2016 +0900
+++ b/tests/test-trusted.py	Thu Apr 14 00:49:58 2016 +0530
@@ -2,8 +2,14 @@
 # with files from different users/groups, we cheat a bit by
 # monkey-patching some functions in the util module
 
+from __future__ import absolute_import
+
 import os
-from mercurial import ui, util, error
+from mercurial import (
+    error,
+    ui as uimod,
+    util,
+)
 
 hgrc = os.environ['HGRCPATH']
 f = open(hgrc)
@@ -60,7 +66,7 @@
     print '# %s user, %s group%s' % (kind[user == cuser], kind[group == cgroup],
                                      trusted)
 
-    u = ui.ui()
+    u = uimod.ui()
     u.setconfig('ui', 'debug', str(bool(debug)))
     u.setconfig('ui', 'report_untrusted', str(bool(report)))
     u.readconfig('.hg/hgrc')
@@ -150,7 +156,7 @@
 
 print
 print "# read trusted, untrusted, new ui, trusted"
-u = ui.ui()
+u = uimod.ui()
 u.setconfig('ui', 'debug', 'on')
 u.readconfig(filename)
 u2 = u.copy()