diff --git a/tests/commitextra.py b/tests/commitextra.py
index ce3c2d71d9db26bfe5f5e12d2e9135ebaf609fc0_dGVzdHMvY29tbWl0ZXh0cmEucHk=..f506f3060f13c096d36e8f1390eff4f3cd4ed993_dGVzdHMvY29tbWl0ZXh0cmEucHk= 100644
--- a/tests/commitextra.py
+++ b/tests/commitextra.py
@@ -2,7 +2,7 @@
 
 from __future__ import absolute_import, print_function
 
-from mercurial import cmdutil, commands, scmutil
+from mercurial import cmdutil, commands, pycompat, scmutil
 
 cmdtable = {}
 try:
@@ -24,5 +24,5 @@
     for field in fields:
         k, v = field.split(b'=', 1)
         extras[k] = v
-    message = cmdutil.logmessage(ui, opts)
+    message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts))
     repo.commit(message, opts.get('user'), opts.get('date'),
@@ -28,3 +28,5 @@
     repo.commit(message, opts.get('user'), opts.get('date'),
-                match=scmutil.match(repo[None], pats, opts), extra=extras)
+                match=scmutil.match(repo[None], pats,
+                                    pycompat.byteskwargs(opts)),
+                extra=extras)
     return 0