--- a/tests/simplestorerepo.py	Fri Jun 29 01:35:09 2018 +0530
+++ b/tests/simplestorerepo.py	Sat Jun 30 18:55:04 2018 -0700
@@ -24,9 +24,6 @@
 from mercurial.thirdparty import (
     cbor,
 )
-from mercurial.thirdparty.zope import (
-    interface as zi,
-)
 from mercurial import (
     ancestor,
     bundlerepo,
@@ -40,6 +37,9 @@
     store,
     verify,
 )
+from mercurial.utils import (
+    interfaceutil,
+)
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
@@ -60,7 +60,7 @@
     if not isinstance(rev, int):
         raise ValueError('expected int')
 
-@zi.implementer(repository.ifilestorage)
+@interfaceutil.implementer(repository.ifilestorage)
 class filestorage(object):
     """Implements storage for a tracked path.