diff --git a/tests/test-i18n.t b/tests/test-i18n.t
index e2b87e19c6efa87f12da17350207ea6d97062cfd_dGVzdHMvdGVzdC1pMThuLnQ=..7bc33d677c0ce4adc78b75af70ea78bc09d50dfa_dGVzdHMvdGVzdC1pMThuLnQ= 100644
--- a/tests/test-i18n.t
+++ b/tests/test-i18n.t
@@ -54,4 +54,5 @@
 Check i18n cache isn't reused after encoding change:
 
   $ cat > $TESTTMP/encodingchange.py << EOF
+  > from mercurial.i18n import _
   > from mercurial import encoding, registrar
@@ -57,5 +58,4 @@
   > from mercurial import encoding, registrar
-  > from mercurial.i18n import _
   > cmdtable = {}
   > command = registrar.command(cmdtable)
   > @command(b'encodingchange', norepo=True)
diff --git a/tests/test-lfs.t b/tests/test-lfs.t
index e2b87e19c6efa87f12da17350207ea6d97062cfd_dGVzdHMvdGVzdC1sZnMudA==..7bc33d677c0ce4adc78b75af70ea78bc09d50dfa_dGVzdHMvdGVzdC1sZnMudA== 100644
--- a/tests/test-lfs.t
+++ b/tests/test-lfs.t
@@ -616,4 +616,5 @@
   $ cat > $TESTTMP/dumpflog.py << EOF
   > # print raw revision sizes, flags, and hashes for certain files
   > import hashlib
+  > from mercurial.node import short
   > from mercurial import revlog
@@ -619,5 +620,4 @@
   > from mercurial import revlog
-  > from mercurial.node import short
   > def hash(rawtext):
   >     h = hashlib.sha512()
   >     h.update(rawtext)
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
index e2b87e19c6efa87f12da17350207ea6d97062cfd_dGVzdHMvdGVzdC1yZXNvbHZlLnQ=..7bc33d677c0ce4adc78b75af70ea78bc09d50dfa_dGVzdHMvdGVzdC1yZXNvbHZlLnQ= 100644
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -85,7 +85,12 @@
 
   $ cat > $TESTTMP/markdriver.py << EOF
   > '''mark and unmark files as driver-resolved'''
-  > from mercurial import merge, registrar, scmutil, pycompat
+  > from mercurial import (
+  >    merge,
+  >    pycompat,
+  >    registrar,
+  >    scmutil,
+  > )
   > cmdtable = {}
   > command = registrar.command(cmdtable)
   > @command(b'markdriver',
diff --git a/tests/test-rollback.t b/tests/test-rollback.t
index e2b87e19c6efa87f12da17350207ea6d97062cfd_dGVzdHMvdGVzdC1yb2xsYmFjay50..7bc33d677c0ce4adc78b75af70ea78bc09d50dfa_dGVzdHMvdGVzdC1yb2xsYmFjay50 100644
--- a/tests/test-rollback.t
+++ b/tests/test-rollback.t
@@ -220,4 +220,5 @@
   > import errno
   > from mercurial.i18n import _
   > from mercurial import (
+  >     error,
   >     registrar,
@@ -223,5 +224,4 @@
   >     registrar,
-  >     error,
   >     ui as uimod,
   > )
   > 
diff --git a/tests/test-split.t b/tests/test-split.t
index e2b87e19c6efa87f12da17350207ea6d97062cfd_dGVzdHMvdGVzdC1zcGxpdC50..7bc33d677c0ce4adc78b75af70ea78bc09d50dfa_dGVzdHMvdGVzdC1zcGxpdC50 100644
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -2,7 +2,8 @@
 
   $ cat > $TESTTMP/editor.py <<EOF
   > #!$PYTHON
-  > import os, sys
+  > import os
+  > import sys
   > path = os.path.join(os.environ['TESTTMP'], 'messages')
   > messages = open(path).read().split('--\n')
   > prompt = open(sys.argv[1]).read()