diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -150,6 +150,7 @@
 test-export.t
 test-extdata.t
 test-extdiff.t
+test-extensions-wrapfunction.py
 test-extra-filelog-entry.t
 test-filebranch.t
 test-filecache.py
diff --git a/tests/test-extensions-wrapfunction.py b/tests/test-extensions-wrapfunction.py
--- a/tests/test-extensions-wrapfunction.py
+++ b/tests/test-extensions-wrapfunction.py
@@ -35,7 +35,7 @@
         print('unwrap %s: %s: %s' % (getid(w), getid(result), msg))
 
 batchwrap(wrappers + [wrappers[0]])
-batchunwrap([(wrappers[i] if i >= 0 else None)
+batchunwrap([(wrappers[i] if i is not None and i >= 0 else None)
              for i in [3, None, 0, 4, 0, 2, 1, None]])
 
 wrap0 = extensions.wrappedfunction(dummy, 'getstack', wrappers[0])