2 files changed, 41 insertions, 10 deletions
diff --git a/libtests/json_handler.cc b/libtests/json_handler.cc
index 618395d5..dcc8e66e 100644
--- a/libtests/json_handler.cc
+++ b/libtests/json_handler.cc
@@ -49,8 +49,7 @@ static std::shared_ptr<JSONHandler> make_all_handler()
 {
     auto h = std::make_shared<JSONHandler>();
     h->addDictHandlers(
-        make_print_message("dict begin"),
-        make_print_message("dict end"));
+        print_json, make_print_message("dict end"));
     auto h1 = std::make_shared<JSONHandler>();
     h1->addStringHandler(print_string);
     h->addDictKeyHandler("one", h1);
@@ -77,13 +76,11 @@ static std::shared_ptr<JSONHandler> make_all_handler()
         h5);
     auto h6 = std::make_shared<JSONHandler>();
     h6->addDictHandlers(
-        make_print_message("dict begin"),
-        make_print_message("dict end"));
+        print_json, make_print_message("dict end"));
     auto h6a = std::make_shared<JSONHandler>();
     h6->addDictKeyHandler("a", h6a);
     h6a->addDictHandlers(
-        make_print_message("dict begin"),
-        make_print_message("dict end"));
+        print_json, make_print_message("dict end"));
     auto h6ab = std::make_shared<JSONHandler>();
     h6a->addDictKeyHandler("b", h6ab);
     auto h6ax = std::make_shared<JSONHandler>();
diff --git a/libtests/qtest/json_handler/json_handler.out b/libtests/qtest/json_handler/json_handler.out
index 368c94b5..d9d99660 100644
--- a/libtests/qtest/json_handler/json_handler.out
+++ b/libtests/qtest/json_handler/json_handler.out
@@ -1,7 +1,30 @@
 -- scalar --
 .: string: potato
 -- all --
-.: json: dict begin
+.: json: {
+  "five": [
+    "x",
+    false,
+    "y",
+    null,
+    true
+  ],
+  "four": [
+    "a",
+    1
+  ],
+  "one": "potato",
+  "phour": null,
+  "six": {
+    "a": {
+      "Q": "baaa",
+      "b": "quack"
+    },
+    "b": "moo"
+  },
+  "three": true,
+  "two": 3.14
+}
 .five: json: array begin
 .five[0]: string: x
 .five[1]: bool: false
@@ -15,8 +38,17 @@
 ]
 .one: string: potato
 .phour: json: null
-.six: json: dict begin
-.six.a: json: dict begin
+.six: json: {
+  "a": {
+    "Q": "baaa",
+    "b": "quack"
+  },
+  "b": "moo"
+}
+.six.a: json: {
+  "Q": "baaa",
+  "b": "quack"
+}
 .six.a.Q: json: "baaa"
 .six.a.b: string: quack
 .six.a: json: dict end
@@ -27,5 +59,7 @@
 .: json: dict end
 -- errors --
 bad type at top: JSON handler: value at . is not of expected type
-.: json: dict begin
+.: json: {
+  "x": "y"
+}
 unexpected key: JSON handler found unexpected key x in object at .