diff --git a/edenscm/hgext/hgsubversion/__init__.py b/edenscm/hgext/hgsubversion/__init__.py
index 82deffd36f..476fd9cddb 100644
--- a/edenscm/hgext/hgsubversion/__init__.py
+++ b/edenscm/hgext/hgsubversion/__init__.py
@@ -17,17 +17,11 @@ details.
 For more information and instructions, see :hg:`help subversion`.
 """
 
-testedwith = "3.7 3.8 3.9 4.0 4.1 4.2 4.3 4.4"
+from __future__ import absolute_import
 
 import os
 import zlib
 
-import compathacks
-import svncommands
-import svnexternals
-import svnrepo
-import util
-import wrappers
 from edenscm.mercurial import (
     commands,
     demandimport,
@@ -42,6 +36,11 @@ from edenscm.mercurial import (
     util as hgutil,
 )
 
+from . import compathacks, svncommands, svnexternals, svnrepo, util, wrappers
+
+
+testedwith = "3.7 3.8 3.9 4.0 4.1 4.2 4.3 4.4"
+
 
 try:
     from edenscm.mercurial import exchange
diff --git a/edenscm/hgext/hgsubversion/compathacks.py b/edenscm/hgext/hgsubversion/compathacks.py
index 0e00aa02fe..eede6d184e 100644
--- a/edenscm/hgext/hgsubversion/compathacks.py
+++ b/edenscm/hgext/hgsubversion/compathacks.py
@@ -2,6 +2,8 @@
 
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import errno
 import sys
 
diff --git a/edenscm/hgext/hgsubversion/editor.py b/edenscm/hgext/hgsubversion/editor.py
index 06a6a39c64..f7ff84e959 100644
--- a/edenscm/hgext/hgsubversion/editor.py
+++ b/edenscm/hgext/hgsubversion/editor.py
@@ -1,16 +1,16 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import errno
 import os
 import shutil
 import sys
 import tempfile
 
-import svnexternals
-import svnwrap
-import util
 from edenscm.mercurial import match as matchmod, node, revlog, util as hgutil
 
+from . import svnexternals, svnwrap, util
 from ..extlib import cstore
 
 
diff --git a/edenscm/hgext/hgsubversion/hooks/updatemeta.py b/edenscm/hgext/hgsubversion/hooks/updatemeta.py
index e8ecb90546..fcf5920d95 100644
--- a/edenscm/hgext/hgsubversion/hooks/updatemeta.py
+++ b/edenscm/hgext/hgsubversion/hooks/updatemeta.py
@@ -7,6 +7,8 @@
 
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import edenscm.hgext.hgsubversion
 import edenscm.hgext.hgsubversion.svncommands
 import edenscm.hgext.hgsubversion.util
diff --git a/edenscm/hgext/hgsubversion/layouts/__init__.py b/edenscm/hgext/hgsubversion/layouts/__init__.py
index 5e2c0a18fc..743071154b 100644
--- a/edenscm/hgext/hgsubversion/layouts/__init__.py
+++ b/edenscm/hgext/hgsubversion/layouts/__init__.py
@@ -8,12 +8,12 @@ other path translation necessary.
 NB: this has a long way to go before it does everything it claims to
 
 """
+from __future__ import absolute_import
 
-import custom
-import single
-import standard
 from edenscm.mercurial import util as hgutil
 
+from . import custom, single, standard
+
 
 __all__ = ["layout_from_name"]
 
diff --git a/edenscm/hgext/hgsubversion/layouts/base.py b/edenscm/hgext/hgsubversion/layouts/base.py
index 8351495dbf..2d8d198fc1 100644
--- a/edenscm/hgext/hgsubversion/layouts/base.py
+++ b/edenscm/hgext/hgsubversion/layouts/base.py
@@ -6,6 +6,7 @@ This module should not contain any implementation, just a definition
 of the API concrete layouts are expected to implement.
 
 """
+from __future__ import absolute_import
 
 
 class BaseLayout(object):
diff --git a/edenscm/hgext/hgsubversion/layouts/custom.py b/edenscm/hgext/hgsubversion/layouts/custom.py
index c51e376e17..9a7be19a5a 100644
--- a/edenscm/hgext/hgsubversion/layouts/custom.py
+++ b/edenscm/hgext/hgsubversion/layouts/custom.py
@@ -8,9 +8,12 @@ want a couple of branches.
 
 """
 
-import base
+from __future__ import absolute_import
+
 from edenscm.mercurial import util as hgutil
 
+from . import base
+
 
 class CustomLayout(base.BaseLayout):
     def __init__(self, meta):
diff --git a/edenscm/hgext/hgsubversion/layouts/single.py b/edenscm/hgext/hgsubversion/layouts/single.py
index 9119f260e7..87fea18405 100644
--- a/edenscm/hgext/hgsubversion/layouts/single.py
+++ b/edenscm/hgext/hgsubversion/layouts/single.py
@@ -1,4 +1,6 @@
-import base
+from __future__ import absolute_import
+
+from . import base
 
 
 class SingleLayout(base.BaseLayout):
diff --git a/edenscm/hgext/hgsubversion/layouts/standard.py b/edenscm/hgext/hgsubversion/layouts/standard.py
index f812eda67d..8504070f88 100644
--- a/edenscm/hgext/hgsubversion/layouts/standard.py
+++ b/edenscm/hgext/hgsubversion/layouts/standard.py
@@ -1,6 +1,8 @@
 # no-check-code -- see T24862348
 
-import base
+from __future__ import absolute_import
+
+from . import base
 
 
 class StandardLayout(base.BaseLayout):
diff --git a/edenscm/hgext/hgsubversion/maps.py b/edenscm/hgext/hgsubversion/maps.py
index 2598f6fe0d..1f523d492e 100644
--- a/edenscm/hgext/hgsubversion/maps.py
+++ b/edenscm/hgext/hgsubversion/maps.py
@@ -2,6 +2,8 @@
 
 """ Module for self-contained maps. """
 
+from __future__ import absolute_import
+
 import collections
 import contextlib
 import errno
@@ -11,10 +13,11 @@ import sqlite3
 import subprocess
 import sys
 
-import util
 from edenscm.mercurial import error, util as hgutil
 from edenscm.mercurial.node import bin, hex, nullid
 
+from . import util
+
 
 class BaseMap(dict):
     """A base class for the different type of mappings: author, branch, and
diff --git a/edenscm/hgext/hgsubversion/pushmod.py b/edenscm/hgext/hgsubversion/pushmod.py
index ca94d9ce47..6b17125387 100644
--- a/edenscm/hgext/hgsubversion/pushmod.py
+++ b/edenscm/hgext/hgsubversion/pushmod.py
@@ -1,12 +1,13 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import re as remod
 
-import svnexternals
-import svnwrap
-import util
 from edenscm.mercurial import util as hgutil
 
+from . import svnexternals, svnwrap, util
+
 
 class NoFilesException(Exception):
     """Exception raised when you try and commit without files.
diff --git a/edenscm/hgext/hgsubversion/replay.py b/edenscm/hgext/hgsubversion/replay.py
index 078b4d31d4..70e5974f5c 100644
--- a/edenscm/hgext/hgsubversion/replay.py
+++ b/edenscm/hgext/hgsubversion/replay.py
@@ -1,11 +1,12 @@
+from __future__ import absolute_import
+
 import errno
 import traceback
 
-import compathacks
-import svnexternals
-import util
 from edenscm.mercurial import context, node, revlog, util as hgutil
 
+from . import compathacks, svnexternals, util
+
 
 class MissingPlainTextError(Exception):
     """Exception raised when the repo lacks a source file required for replaying
diff --git a/edenscm/hgext/hgsubversion/stupid.py b/edenscm/hgext/hgsubversion/stupid.py
index a55f9e1d86..7e8300c572 100644
--- a/edenscm/hgext/hgsubversion/stupid.py
+++ b/edenscm/hgext/hgsubversion/stupid.py
@@ -4,12 +4,10 @@ import cStringIO
 import errno
 import re
 
-import compathacks
-import svnexternals
-import svnwrap
-import util
 from edenscm.mercurial import context, node, patch, revlog, util as hgutil
 
+from . import compathacks, svnexternals, svnwrap, util
+
 
 # Here is a diff mixing content and property changes in svn >= 1.7
 #
diff --git a/edenscm/hgext/hgsubversion/svncommands.py b/edenscm/hgext/hgsubversion/svncommands.py
index e69b20dd78..360f921512 100644
--- a/edenscm/hgext/hgsubversion/svncommands.py
+++ b/edenscm/hgext/hgsubversion/svncommands.py
@@ -1,18 +1,16 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import errno
 import os
 import sys
 import traceback
 
-import svnexternals
-import svnmeta
-import svnrepo
-import svnwrap
-import util
-import verify
 from edenscm.mercurial import commands, error, hg, node, progress, util as hgutil
 
+from . import svnexternals, svnmeta, svnrepo, svnwrap, util, verify
+
 
 def updatemeta(ui, repo, args, **opts):
     """Do a partial rebuild of the subversion metadata.
diff --git a/edenscm/hgext/hgsubversion/svnexternals.py b/edenscm/hgext/hgsubversion/svnexternals.py
index 4a52cc5410..7123180bf6 100644
--- a/edenscm/hgext/hgsubversion/svnexternals.py
+++ b/edenscm/hgext/hgsubversion/svnexternals.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import cStringIO
 import os
 import re
@@ -7,10 +9,11 @@ import shutil
 import stat
 import subprocess
 
-import util
 from edenscm.mercurial import util as hgutil
 from edenscm.mercurial.i18n import _
 
+from . import util
+
 
 try:
     from edenscm.mercurial import scmutil
diff --git a/edenscm/hgext/hgsubversion/svnmeta.py b/edenscm/hgext/hgsubversion/svnmeta.py
index 37fb5831fc..d72833141d 100644
--- a/edenscm/hgext/hgsubversion/svnmeta.py
+++ b/edenscm/hgext/hgsubversion/svnmeta.py
@@ -1,16 +1,14 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import posixpath
 
-import compathacks
-import editor
-import layouts
-import maps
-import svnwrap
-import util
 from edenscm.mercurial import context, node, revlog, util as hgutil
 
+from . import compathacks, editor, layouts, maps, svnwrap, util
+
 
 class SVNMeta(object):
     def __init__(self, repo, uuid=None, subdir=None, skiperrorcheck=False):
diff --git a/edenscm/hgext/hgsubversion/svnrepo.py b/edenscm/hgext/hgsubversion/svnrepo.py
index bcefe31905..f4cd84893d 100644
--- a/edenscm/hgext/hgsubversion/svnrepo.py
+++ b/edenscm/hgext/hgsubversion/svnrepo.py
@@ -16,15 +16,15 @@ subclass: pull() is called on the instance pull *to*, but not the one pulled
   are used to distinguish and filter these operations from others.
 """
 
+from __future__ import absolute_import
+
 import errno
 
-import svnmeta
-import svnwrap
-import util
-import wrappers
 from edenscm.mercurial import error, httppeer, localrepo, phases, util as hgutil
 from edenscm.mercurial.repository import peer as peerrepository
 
+from . import svnmeta, svnwrap, util, wrappers
+
 
 peerapi = 1
 
diff --git a/edenscm/hgext/hgsubversion/svnwrap/__init__.py b/edenscm/hgext/hgsubversion/svnwrap/__init__.py
index cda86450e8..cdbfe61dd3 100644
--- a/edenscm/hgext/hgsubversion/svnwrap/__init__.py
+++ b/edenscm/hgext/hgsubversion/svnwrap/__init__.py
@@ -8,17 +8,19 @@ available implementation without the user having to configure what is actually
 present.
 """
 
+from __future__ import absolute_import
+
 import os
 
-from common import *
+from .common import *
 
 
 choice = os.environ.get("HGSUBVERSION_BINDINGS", "").lower()
 
 if choice == "subvertpy":
-    from subvertpy_wrapper import *
+    from .subvertpy_wrapper import *
 elif choice == "swig":
-    from svn_swig_wrapper import *
+    from .svn_swig_wrapper import *
 elif choice == "none":
     # useful for verifying that demandimport works properly
     raise ImportError(
@@ -26,10 +28,10 @@ elif choice == "none":
     )
 else:
     try:
-        from subvertpy_wrapper import *
+        from .subvertpy_wrapper import *
     except ImportError as e1:
         try:
-            from svn_swig_wrapper import *
+            from .svn_swig_wrapper import *
         except ImportError as e2:
             raise ImportError(
                 "no compatible bindings available:\n\n"
diff --git a/edenscm/hgext/hgsubversion/svnwrap/common.py b/edenscm/hgext/hgsubversion/svnwrap/common.py
index e377ab86e6..86dc2a032e 100644
--- a/edenscm/hgext/hgsubversion/svnwrap/common.py
+++ b/edenscm/hgext/hgsubversion/svnwrap/common.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import ConfigParser
 import fnmatch
 import os
diff --git a/edenscm/hgext/hgsubversion/svnwrap/subvertpy_wrapper.py b/edenscm/hgext/hgsubversion/svnwrap/subvertpy_wrapper.py
index 92ab9e76b2..bdc231c448 100644
--- a/edenscm/hgext/hgsubversion/svnwrap/subvertpy_wrapper.py
+++ b/edenscm/hgext/hgsubversion/svnwrap/subvertpy_wrapper.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import collections
 import cStringIO
 import errno
@@ -7,7 +9,7 @@ import os
 import urllib
 import warnings
 
-import common
+from . import common
 
 
 warnings.filterwarnings("ignore", module="svn.core", category=DeprecationWarning)
diff --git a/edenscm/hgext/hgsubversion/svnwrap/svn_swig_wrapper.py b/edenscm/hgext/hgsubversion/svnwrap/svn_swig_wrapper.py
index 408e3ce220..32bdd2cc51 100644
--- a/edenscm/hgext/hgsubversion/svnwrap/svn_swig_wrapper.py
+++ b/edenscm/hgext/hgsubversion/svnwrap/svn_swig_wrapper.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import collections
 import cStringIO
 import errno
@@ -10,7 +12,7 @@ import tempfile
 import urllib
 import warnings
 
-import common
+from . import common
 
 
 warnings.filterwarnings("ignore", module="svn.core", category=DeprecationWarning)
diff --git a/edenscm/hgext/hgsubversion/util.py b/edenscm/hgext/hgsubversion/util.py
index cafe39a79d..55408992a1 100644
--- a/edenscm/hgext/hgsubversion/util.py
+++ b/edenscm/hgext/hgsubversion/util.py
@@ -1,14 +1,17 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import gc
 import json
 import os
 import re
 import urllib
 
-import compathacks
 from edenscm.mercurial import error, hg, node, repair, util as hgutil
 
+from . import compathacks
+
 
 try:
     xrange(0)
diff --git a/edenscm/hgext/hgsubversion/verify.py b/edenscm/hgext/hgsubversion/verify.py
index 81e826ff12..f4d9a93ffa 100644
--- a/edenscm/hgext/hgsubversion/verify.py
+++ b/edenscm/hgext/hgsubversion/verify.py
@@ -1,13 +1,14 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import difflib
 import posixpath
 
-import svnrepo
-import svnwrap
-import util
 from edenscm.mercurial import error, progress, util as hgutil, worker
 
+from . import svnrepo, svnwrap, util
+
 
 def verify(ui, repo, args=None, **opts):
     """verify current revision against Subversion repository
diff --git a/edenscm/hgext/hgsubversion/wrappers.py b/edenscm/hgext/hgsubversion/wrappers.py
index 692d2b73f4..ea34d551d2 100644
--- a/edenscm/hgext/hgsubversion/wrappers.py
+++ b/edenscm/hgext/hgsubversion/wrappers.py
@@ -1,6 +1,7 @@
 # no-check-code -- see T24862348
 # isort:skip_file
 
+from __future__ import absolute_import
 import inspect
 import os
 
@@ -25,11 +26,11 @@ from edenscm.mercurial import i18n
 from edenscm.mercurial import extensions
 from edenscm.mercurial import scmutil
 
-import replay
-import pushmod
-import stupid as stupidmod
-import svnwrap
-import util
+from . import replay
+from . import pushmod
+from . import stupid as stupidmod
+from . import svnwrap
+from . import util
 
 try:
     from edenscm.mercurial import obsolete
diff --git a/tests/comprehensive/test-hgsubversion-custom-layout.py b/tests/comprehensive/test-hgsubversion-custom-layout.py
index 0557649731..75c40b05bf 100644
--- a/tests/comprehensive/test-hgsubversion-custom-layout.py
+++ b/tests/comprehensive/test-hgsubversion-custom-layout.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import sys
 
diff --git a/tests/comprehensive/test-hgsubversion-obsstore-on.py b/tests/comprehensive/test-hgsubversion-obsstore-on.py
index 5060ea0242..57022fd987 100644
--- a/tests/comprehensive/test-hgsubversion-obsstore-on.py
+++ b/tests/comprehensive/test-hgsubversion-obsstore-on.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import sys
 
diff --git a/tests/comprehensive/test-hgsubversion-rebuildmeta.py b/tests/comprehensive/test-hgsubversion-rebuildmeta.py
index 6eddef5f4a..e7f02d9fe8 100644
--- a/tests/comprehensive/test-hgsubversion-rebuildmeta.py
+++ b/tests/comprehensive/test-hgsubversion-rebuildmeta.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import sys
 
diff --git a/tests/comprehensive/test-hgsubversion-sqlite-revmap.py b/tests/comprehensive/test-hgsubversion-sqlite-revmap.py
index 67c1e75bd1..37fdba15a1 100644
--- a/tests/comprehensive/test-hgsubversion-sqlite-revmap.py
+++ b/tests/comprehensive/test-hgsubversion-sqlite-revmap.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import sys
 
diff --git a/tests/comprehensive/test-hgsubversion-stupid-pull.py b/tests/comprehensive/test-hgsubversion-stupid-pull.py
index 855f38835c..852aa5ff54 100644
--- a/tests/comprehensive/test-hgsubversion-stupid-pull.py
+++ b/tests/comprehensive/test-hgsubversion-stupid-pull.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import sys
 
diff --git a/tests/comprehensive/test-hgsubversion-updatemeta.py b/tests/comprehensive/test-hgsubversion-updatemeta.py
index cd96122efe..6b9333b1fd 100644
--- a/tests/comprehensive/test-hgsubversion-updatemeta.py
+++ b/tests/comprehensive/test-hgsubversion-updatemeta.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import sys
 
diff --git a/tests/comprehensive/test-hgsubversion-verify-and-startrev.py b/tests/comprehensive/test-hgsubversion-verify-and-startrev.py
index 29fe9755fc..08059d7849 100644
--- a/tests/comprehensive/test-hgsubversion-verify-and-startrev.py
+++ b/tests/comprehensive/test-hgsubversion-verify-and-startrev.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import sys
 
diff --git a/tests/test-fb-hgext-extutil.py b/tests/test-fb-hgext-extutil.py
index 141e1d8614..ff6e51e0d4 100644
--- a/tests/test-fb-hgext-extutil.py
+++ b/tests/test-fb-hgext-extutil.py
@@ -1,5 +1,7 @@
 # Copyright 2004-present Facebook. All Rights Reserved.
 
+from __future__ import absolute_import
+
 import errno
 import os
 import time
diff --git a/tests/test-fb-hgext-fastmanifest.py b/tests/test-fb-hgext-fastmanifest.py
index c61cfa9732..ab9ef37c9e 100644
--- a/tests/test-fb-hgext-fastmanifest.py
+++ b/tests/test-fb-hgext-fastmanifest.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 import time
 import unittest
diff --git a/tests/test-fb-hgext-generic-bisect.py b/tests/test-fb-hgext-generic-bisect.py
index f7cd0f287c..ee2acd71f6 100644
--- a/tests/test-fb-hgext-generic-bisect.py
+++ b/tests/test-fb-hgext-generic-bisect.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import unittest
 
 import silenttestrunner
diff --git a/tests/test-fb-hgext-sshaskpass.py b/tests/test-fb-hgext-sshaskpass.py
index 06726d43f0..9715d31843 100644
--- a/tests/test-fb-hgext-sshaskpass.py
+++ b/tests/test-fb-hgext-sshaskpass.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 import sys
 
diff --git a/tests/test-hggit-url-parsing.py b/tests/test-hggit-url-parsing.py
index d09e6305c1..25aa0536f0 100644
--- a/tests/test-hggit-url-parsing.py
+++ b/tests/test-hggit-url-parsing.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import shutil
 import sys
 import tempfile
diff --git a/tests/test-hgsubversion-binaryfiles.py b/tests/test-hgsubversion-binaryfiles.py
index 752a15ed3e..989bb57797 100644
--- a/tests/test-hgsubversion-binaryfiles.py
+++ b/tests/test-hgsubversion-binaryfiles.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 
 
diff --git a/tests/test-hgsubversion-diff.py b/tests/test-hgsubversion-diff.py
index a655a78c8e..6469195dbc 100644
--- a/tests/test-hgsubversion-diff.py
+++ b/tests/test-hgsubversion-diff.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 from edenscm.hgext.hgsubversion import wrappers
 
diff --git a/tests/test-hgsubversion-externals.py b/tests/test-hgsubversion-externals.py
index 2dcac02160..91df6d8464 100644
--- a/tests/test-hgsubversion-externals.py
+++ b/tests/test-hgsubversion-externals.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 
 import test_hgsubversion_util
@@ -121,9 +123,9 @@ class TestFetchExternals(test_hgsubversion_util.TestBase):
         ref1 = """\
 [.]
  # A comment, then an empty line, then a blank line
- 
+
  ^/externals/project1 deps/project1
-     
+
  -r2 ^/externals/project2@2 deps/project2
 """
         self.assertMultiLineEqual(ref1, repo[1][".hgsvnexternals"].data())
diff --git a/tests/test-hgsubversion-fetch-command-regexes.py b/tests/test-hgsubversion-fetch-command-regexes.py
index af52336c91..68d92a2325 100644
--- a/tests/test-hgsubversion-fetch-command-regexes.py
+++ b/tests/test-hgsubversion-fetch-command-regexes.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import unittest
 
 from edenscm.hgext.hgsubversion import stupid
diff --git a/tests/test-hgsubversion-fetch-command.py b/tests/test-hgsubversion-fetch-command.py
index 52ae532c20..46ac1449b8 100644
--- a/tests/test-hgsubversion-fetch-command.py
+++ b/tests/test-hgsubversion-fetch-command.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import urllib
 
diff --git a/tests/test-hgsubversion-fetch-dir-removal.py b/tests/test-hgsubversion-fetch-dir-removal.py
index 913c14bf02..6c52a3fb0d 100644
--- a/tests/test-hgsubversion-fetch-dir-removal.py
+++ b/tests/test-hgsubversion-fetch-dir-removal.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 
 
diff --git a/tests/test-hgsubversion-fetch-exec.py b/tests/test-hgsubversion-fetch-exec.py
index bad9943efa..5c19ef1350 100644
--- a/tests/test-hgsubversion-fetch-exec.py
+++ b/tests/test-hgsubversion-fetch-exec.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 from edenscm.mercurial import node
 
diff --git a/tests/test-hgsubversion-fetch-mappings.py b/tests/test-hgsubversion-fetch-mappings.py
index 7c28e7cf71..1c86da56eb 100644
--- a/tests/test-hgsubversion-fetch-mappings.py
+++ b/tests/test-hgsubversion-fetch-mappings.py
@@ -1,7 +1,7 @@
 # no-check-code -- see T24862348
 
-"""Tests for author maps and file maps.
-"""
+from __future__ import absolute_import
+
 import os
 
 import test_hgsubversion_util
@@ -9,6 +9,10 @@ from edenscm.hgext.hgsubversion import maps, svncommands, verify
 from edenscm.mercurial import commands, node
 
 
+"""Tests for author maps and file maps.
+"""
+
+
 class MapTests(test_hgsubversion_util.TestBase):
     stupid_mode_tests = True
 
diff --git a/tests/test-hgsubversion-fetch-renames.py b/tests/test-hgsubversion-fetch-renames.py
index 09d438d371..b1a36ba6bc 100644
--- a/tests/test-hgsubversion-fetch-renames.py
+++ b/tests/test-hgsubversion-fetch-renames.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import sys
 
 import test_hgsubversion_util
diff --git a/tests/test-hgsubversion-fetch-symlinks.py b/tests/test-hgsubversion-fetch-symlinks.py
index 7c1d5f29f1..6133643e69 100644
--- a/tests/test-hgsubversion-fetch-symlinks.py
+++ b/tests/test-hgsubversion-fetch-symlinks.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 
 
diff --git a/tests/test-hgsubversion-fetch-truncated.py b/tests/test-hgsubversion-fetch-truncated.py
index 910e5b01f2..f1ec4b563d 100644
--- a/tests/test-hgsubversion-fetch-truncated.py
+++ b/tests/test-hgsubversion-fetch-truncated.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 from edenscm.mercurial import commands, hg
 
diff --git a/tests/test-hgsubversion-globalrevs.py b/tests/test-hgsubversion-globalrevs.py
index 7635cc221f..a9a6aa490e 100644
--- a/tests/test-hgsubversion-globalrevs.py
+++ b/tests/test-hgsubversion-globalrevs.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 from edenscm.mercurial import hg
 
diff --git a/tests/test-hgsubversion-helpers.py b/tests/test-hgsubversion-helpers.py
index 1479dafbbc..e37cc17957 100644
--- a/tests/test-hgsubversion-helpers.py
+++ b/tests/test-hgsubversion-helpers.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 import unittest
 
diff --git a/tests/test-hgsubversion-hooks.py b/tests/test-hgsubversion-hooks.py
index b50bc8228e..11e49775ab 100644
--- a/tests/test-hgsubversion-hooks.py
+++ b/tests/test-hgsubversion-hooks.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 from edenscm.mercurial import commands, hg
 
diff --git a/tests/test-hgsubversion-pull-fallback.py b/tests/test-hgsubversion-pull-fallback.py
index 71a2e26135..d04eab3b7d 100644
--- a/tests/test-hgsubversion-pull-fallback.py
+++ b/tests/test-hgsubversion-pull-fallback.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import edenscm.mercurial as mercurial
 import test_hgsubversion_util
 from edenscm.hgext.hgsubversion import stupid
diff --git a/tests/test-hgsubversion-pull.py b/tests/test-hgsubversion-pull.py
index 52b3c0f2cb..64616816c9 100644
--- a/tests/test-hgsubversion-pull.py
+++ b/tests/test-hgsubversion-pull.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 from edenscm.hgext.hgsubversion import verify
 from edenscm.mercurial import commands, node, util as hgutil
diff --git a/tests/test-hgsubversion-push-autoprops.py b/tests/test-hgsubversion-push-autoprops.py
index 6ee36ca420..8d48b11ddb 100644
--- a/tests/test-hgsubversion-push-autoprops.py
+++ b/tests/test-hgsubversion-push-autoprops.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 
 import test_hgsubversion_util
diff --git a/tests/test-hgsubversion-push-command.py b/tests/test-hgsubversion-push-command.py
index 14a13eca42..6017ca7159 100644
--- a/tests/test-hgsubversion-push-command.py
+++ b/tests/test-hgsubversion-push-command.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import errno
 import os
 import random
diff --git a/tests/test-hgsubversion-push-dirs.py b/tests/test-hgsubversion-push-dirs.py
index 7c15706308..209382a9ae 100644
--- a/tests/test-hgsubversion-push-dirs.py
+++ b/tests/test-hgsubversion-push-dirs.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 
 
diff --git a/tests/test-hgsubversion-push-eol.py b/tests/test-hgsubversion-push-eol.py
index 95f8cf2b68..756aa6d9ac 100644
--- a/tests/test-hgsubversion-push-eol.py
+++ b/tests/test-hgsubversion-push-eol.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 
 
diff --git a/tests/test-hgsubversion-push-renames.py b/tests/test-hgsubversion-push-renames.py
index 0663b8d230..7f796a372b 100644
--- a/tests/test-hgsubversion-push-renames.py
+++ b/tests/test-hgsubversion-push-renames.py
@@ -1,6 +1,8 @@
 # no-check-code -- see T24862348
 # @nolint
 
+from __future__ import absolute_import
+
 import sys
 
 import test_hgsubversion_util
diff --git a/tests/test-hgsubversion-revmap-migrate.py b/tests/test-hgsubversion-revmap-migrate.py
index 709c8fb8c1..282bff58f0 100644
--- a/tests/test-hgsubversion-revmap-migrate.py
+++ b/tests/test-hgsubversion-revmap-migrate.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 from edenscm.hgext.hgsubversion import maps, svnmeta
 
diff --git a/tests/test-hgsubversion-single-dir-clone.py b/tests/test-hgsubversion-single-dir-clone.py
index 93595aad6b..c8232df829 100644
--- a/tests/test-hgsubversion-single-dir-clone.py
+++ b/tests/test-hgsubversion-single-dir-clone.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import shutil
 
 import test_hgsubversion_util
diff --git a/tests/test-hgsubversion-single-dir-push.py b/tests/test-hgsubversion-single-dir-push.py
index 2233ae5eb7..eff1e9ad1b 100644
--- a/tests/test-hgsubversion-single-dir-push.py
+++ b/tests/test-hgsubversion-single-dir-push.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import errno
 
 import test_hgsubversion_util
diff --git a/tests/test-hgsubversion-svn-pre-commit-hooks.py b/tests/test-hgsubversion-svn-pre-commit-hooks.py
index 8829196931..96f19960b9 100644
--- a/tests/test-hgsubversion-svn-pre-commit-hooks.py
+++ b/tests/test-hgsubversion-svn-pre-commit-hooks.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 
 import test_hgsubversion_util
diff --git a/tests/test-hgsubversion-svnwrap.py b/tests/test-hgsubversion-svnwrap.py
index ff22c05613..221e4a37fa 100644
--- a/tests/test-hgsubversion-svnwrap.py
+++ b/tests/test-hgsubversion-svnwrap.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import os
 import subprocess
 import tempfile
diff --git a/tests/test-hgsubversion-tags.py b/tests/test-hgsubversion-tags.py
index 2492f3b8a2..f927d9a777 100644
--- a/tests/test-hgsubversion-tags.py
+++ b/tests/test-hgsubversion-tags.py
@@ -1,6 +1,8 @@
 # no-check-code -- see T24862348
 # @nolint
 
+from __future__ import absolute_import
+
 import cStringIO
 import difflib
 import os
diff --git a/tests/test-hgsubversion-template-keywords.py b/tests/test-hgsubversion-template-keywords.py
index ea241aabc1..1c84c61f8e 100644
--- a/tests/test-hgsubversion-template-keywords.py
+++ b/tests/test-hgsubversion-template-keywords.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import test_hgsubversion_util
 from edenscm.mercurial import commands, error, ui
 
diff --git a/tests/test-hgsubversion-unaffected-core.py b/tests/test-hgsubversion-unaffected-core.py
index caad39d5e2..3a469546d6 100644
--- a/tests/test-hgsubversion-unaffected-core.py
+++ b/tests/test-hgsubversion-unaffected-core.py
@@ -1,5 +1,7 @@
 # @nolint
 
+from __future__ import absolute_import
+
 import os
 
 import test_hgsubversion_util
diff --git a/tests/test-hgsubversion-urls.py b/tests/test-hgsubversion-urls.py
index 20e589e152..ecb94b1ab8 100644
--- a/tests/test-hgsubversion-urls.py
+++ b/tests/test-hgsubversion-urls.py
@@ -1,5 +1,7 @@
 # no-check-code -- see T24862348
 
+from __future__ import absolute_import
+
 import urllib
 
 import test_hgsubversion_util
diff --git a/tests/test-hgsubversion-utility-commands.py b/tests/test-hgsubversion-utility-commands.py
index a011146382..d6c1b111c3 100644
--- a/tests/test-hgsubversion-utility-commands.py
+++ b/tests/test-hgsubversion-utility-commands.py
@@ -1,4 +1,7 @@
 # no-check-code -- see T24862348
+
+from __future__ import absolute_import
+
 import os
 import re
 
diff --git a/tests/test_hgsubversion_util.py b/tests/test_hgsubversion_util.py
index 968d62e304..dc7197d1ae 100644
--- a/tests/test_hgsubversion_util.py
+++ b/tests/test_hgsubversion_util.py
@@ -1,6 +1,8 @@
 # no-check-code -- see T24862348
 # flake8: noqa
 
+from __future__ import absolute_import
+
 import difflib
 import errno
 import gettext