--- a/tests/test-install.t	Wed Mar 02 13:13:05 2016 -0500
+++ b/tests/test-install.t	Wed Mar 09 18:58:51 2016 +0000
@@ -6,10 +6,35 @@
   checking Python lib (*lib*)... (glob)
   checking installed modules (*mercurial)... (glob)
   checking templates (*mercurial?templates)... (glob)
-  checking commit editor...
-  checking username...
+  checking default template (*mercurial?templates?map-cmdline.default) (glob)
+  checking commit editor... (*python* -c "import sys; sys.exit(0)") (glob)
+  checking username (test)
   no problems detected
 
+hg debuginstall JSON
+  $ hg debuginstall -Tjson
+  [
+   {
+    "defaulttemplate": "*mercurial?templates?map-cmdline.default", (glob)
+    "defaulttemplateerror": null,
+    "defaulttemplatenotfound": "default",
+    "editor": "*python* -c \"import sys; sys.exit(0)\"", (glob)
+    "editornotfound": false,
+    "encoding": "ascii",
+    "encodingerror": null,
+    "extensionserror": null,
+    "hgmodules": "*mercurial", (glob)
+    "problems": 0,
+    "pythonexe": "*python", (glob)
+    "pythonlib": "*python*", (glob)
+    "pythonver": "*.*.*", (glob)
+    "templatedirs": "*mercurial?templates", (glob)
+    "username": "test",
+    "usernameerror": null,
+    "vinotfound": false
+   }
+  ]
+
 hg debuginstall with no username
   $ HGUSER= hg debuginstall
   checking encoding (ascii)...
@@ -18,7 +43,8 @@
   checking Python lib (*lib*)... (glob)
   checking installed modules (*mercurial)... (glob)
   checking templates (*mercurial?templates)... (glob)
-  checking commit editor...
+  checking default template (*mercurial?templates?map-cmdline.default) (glob)
+  checking commit editor... (*python* -c "import sys; sys.exit(0)") (glob)
   checking username...
    no username supplied
    (specify a username in your configuration file)
@@ -38,8 +64,9 @@
   checking Python lib (*lib*)... (glob)
   checking installed modules (*mercurial)... (glob)
   checking templates (*mercurial?templates)... (glob)
-  checking commit editor...
-  checking username...
+  checking default template (*mercurial?templates?map-cmdline.default) (glob)
+  checking commit editor... (*python* -c "import sys; sys.exit(0)") (glob)
+  checking username (test)
   no problems detected
 
 #if test-repo