diff -r 110040e715c9 -r 88624b40a9cb tests/hghave.py
--- a/tests/hghave.py	Tue Oct 17 10:41:56 2017 -0700
+++ b/tests/hghave.py	Tue Oct 17 11:35:58 2017 -0700
@@ -601,7 +601,8 @@
 
 @check("demandimport", "demandimport enabled")
 def has_demandimport():
-    return os.environ.get('HGDEMANDIMPORT') != 'disable'
+    # chg disables demandimport intentionally for performance wins.
+    return ((not has_chg()) and os.environ.get('HGDEMANDIMPORT') != 'disable')
 
 @check("py3k", "running with Python 3.x")
 def has_py3k():