diff --git a/tests/test-conflict.t b/tests/test-conflict.t
--- a/tests/test-conflict.t
+++ b/tests/test-conflict.t
@@ -60,6 +60,22 @@
   # To continue:    hg commit
   # To abort:       hg merge --abort
   
+  $ hg status -Tjson
+  [
+   {
+    "path": "a",
+    "status": "M"
+   },
+   {
+    "path": "a.orig",
+    "status": "?"
+   },
+   {
+    "conflictsmsg": "# Unresolved merge conflicts:\n# \n#     a\n# \n# To mark files as resolved:  hg resolve --mark FILE\n",
+    "helpmsg": "# To continue:    hg commit\n# To abort:       hg merge --abort\n",
+    "statemsg": "# The repository is in an unfinished *merge* state.\n"
+   }
+  ]
 
   $ cat a
   Small Mathematical Series.