diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t
+++ b/tests/test-bundle2-exchange.t
@@ -917,7 +917,7 @@ Test lazily acquiring the lock during un
   >         raise error.Abort(b"Lock should not be taken")
   >     return orig(repo, *args, **kwargs)
   > def extsetup(ui):
-  >    extensions.wrapfunction(bundle2, b'processbundle', checklock)
+  >    extensions.wrapfunction(bundle2, 'processbundle', checklock)
   > EOF
 
   $ hg init lazylock
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -923,7 +923,7 @@ unix domain socket:
   >         raise Exception('crash')
   >     return orig(ui, repo, conn, createcmdserver, prereposetups)
   > def extsetup(ui):
-  >     extensions.wrapfunction(commandserver, b'_serverequest', _serverequest)
+  >     extensions.wrapfunction(commandserver, '_serverequest', _serverequest)
   > EOF
   $ cat <<EOF >> .hg/hgrc
   > [extensions]
diff --git a/tests/test-fncache.t b/tests/test-fncache.t
--- a/tests/test-fncache.t
+++ b/tests/test-fncache.t
@@ -275,7 +275,7 @@ Aborting transaction prevents fncache ch
   > 
   > def uisetup(ui):
   >     extensions.wrapfunction(
-  >         localrepo.localrepository, b'transaction', wrapper)
+  >         localrepo.localrepository, 'transaction', wrapper)
   > 
   > cmdtable = {}
   > 
diff --git a/tests/test-hgweb.t b/tests/test-hgweb.t
--- a/tests/test-hgweb.t
+++ b/tests/test-hgweb.t
@@ -876,7 +876,7 @@ Test signal-safe-lock in web and non-web
   >     except ValueError:
   >         raise error.Abort(b'signal.signal() called in thread?')
   > def uisetup(ui):
-  >    extensions.wrapfunction(signal, b'signal', disabledsig)
+  >    extensions.wrapfunction(signal, 'signal', disabledsig)
   > EOF
 
  by default, signal interrupt should be disabled while making a lock file
diff --git a/tests/test-lfs.t b/tests/test-lfs.t
--- a/tests/test-lfs.t
+++ b/tests/test-lfs.t
@@ -829,7 +829,7 @@ blob, and the output shows that it isn't
   > eh = exthelper.exthelper()
   > uisetup = eh.finaluisetup
   > 
-  > @eh.wrapfunction(wrapper, b'filelogrenamed')
+  > @eh.wrapfunction(wrapper, 'filelogrenamed')
   > def filelogrenamed(orig, orig1, self, node):
   >     ret = orig(orig1, self, node)
   >     if wrapper._islfs(self._revlog, node) and ret:
diff --git a/tests/test-narrow-expanddirstate.t b/tests/test-narrow-expanddirstate.t
--- a/tests/test-narrow-expanddirstate.t
+++ b/tests/test-narrow-expanddirstate.t
@@ -99,7 +99,7 @@ have this method available in narrowhg p
   >       expandnarrowspec(ui, repo, encoding.environ.get(b'PATCHINCLUDES'))
   >       return orig(ui, repo, *args, **kwargs)
   > 
-  >   extensions.wrapfunction(patch, b'patch', overridepatch)
+  >   extensions.wrapfunction(patch, 'patch', overridepatch)
   > EOF
   $ cat >> ".hg/hgrc" <<EOF
   > [extensions]
diff --git a/tests/test-push-race.t b/tests/test-push-race.t
--- a/tests/test-push-race.t
+++ b/tests/test-push-race.t
@@ -76,7 +76,7 @@ A set of extension and shell functions e
   >     return orig(pushop)
   > 
   > def uisetup(ui):
-  >     extensions.wrapfunction(exchange, b'_pushbundle2', delaypush)
+  >     extensions.wrapfunction(exchange, '_pushbundle2', delaypush)
   > EOF
 
   $ waiton () {
diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
--- a/tests/test-ssh-bundle1.t
+++ b/tests/test-ssh-bundle1.t
@@ -427,7 +427,7 @@ stderr from remote commands should be pr
   >     return res
   > 
   > def extsetup(ui):
-  >     extensions.wrapfunction(exchange, b'push', wrappedpush)
+  >     extensions.wrapfunction(exchange, 'push', wrappedpush)
   > EOF
 
   $ cat >> .hg/hgrc << EOF
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -479,7 +479,7 @@ stderr from remote commands should be pr
   >     return res
   > 
   > def extsetup(ui):
-  >     extensions.wrapfunction(exchange, b'push', wrappedpush)
+  >     extensions.wrapfunction(exchange, 'push', wrappedpush)
   > EOF
 
   $ cat >> .hg/hgrc << EOF
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -970,7 +970,7 @@ Check that the phase cache is properly i
   >          transaction.addpostclose(b"phase invalidation test", test)
   >     return transaction
   > def extsetup(ui):
-  >     extensions.wrapfunction(localrepo.localrepository, b"transaction",
+  >     extensions.wrapfunction(localrepo.localrepository, "transaction",
   >                             transactioncallback)
   > EOF
   $ hg up -C 2