diff -r acfce52518c4 -r 98e2c78e309c tests/helpers-testrepo.sh
--- a/tests/helpers-testrepo.sh	Wed Jun 28 13:45:51 2017 -0700
+++ b/tests/helpers-testrepo.sh	Wed Jun 28 12:23:22 2017 -0700
@@ -18,10 +18,7 @@
 # Revert the environment so that running "hg" runs the system hg
 # rather than the test hg installation.
 syshgenv () {
-    PATH="$ORIG_PATH"
-    PYTHONPATH="$ORIG_PYTHONPATH"
-    JYTHONPATH="$ORIG_JYTHONPATH"
-    unset HGRCPATH
+    . "$HGTEST_RESTOREENV"
     HGPLAIN=1
     export HGPLAIN
 }