=== modified file 'mandos-ctl'
--- mandos-ctl	2019-03-03 16:25:45 +0000
+++ mandos-ctl	2019-03-03 16:54:45 +0000
@@ -868,6 +868,67 @@
 """[1:-1]
         self.assertEqual(output, expected_output)
 
+class TestDumpJSONCmd(TestCmd):
+    def setUp(self):
+        self.expected_json = {
+            "foo": {
+                "Name": "foo",
+                "KeyID": ("92ed150794387c03ce684574b1139a65"
+                          "94a34f895daaaf09fd8ea90a27cddb12"),
+                "Host": "foo.example.org",
+                "Enabled": True,
+                "Timeout": 300000,
+                "LastCheckedOK": "2019-02-03T00:00:00",
+                "Created": "2019-01-02T00:00:00",
+                "Interval": 120000,
+                "Fingerprint": ("778827225BA7DE539C5A"
+                                "7CFA59CFF7CDBD9A5920"),
+                "CheckerRunning": False,
+                "LastEnabled": "2019-01-03T00:00:00",
+                "ApprovalPending": False,
+                "ApprovedByDefault": True,
+                "LastApprovalRequest": "",
+                "ApprovalDelay": 0,
+                "ApprovalDuration": 1000,
+                "Checker": "fping -q -- %(host)s",
+                "ExtendedTimeout": 900000,
+                "Expires": "2019-02-04T00:00:00",
+                "LastCheckerStatus": 0,
+            },
+            "barbar": {
+                "Name": "barbar",
+                "KeyID": ("0558568eedd67d622f5c83b35a115f79"
+                          "6ab612cff5ad227247e46c2b020f441c"),
+                "Host": "192.0.2.3",
+                "Enabled": True,
+                "Timeout": 300000,
+                "LastCheckedOK": "2019-02-04T00:00:00",
+                "Created": "2019-01-03T00:00:00",
+                "Interval": 120000,
+                "Fingerprint": ("3E393AEAEFB84C7E89E2"
+                                "F547B3A107558FCA3A27"),
+                "CheckerRunning": True,
+                "LastEnabled": "2019-01-04T00:00:00",
+                "ApprovalPending": False,
+                "ApprovedByDefault": False,
+                "LastApprovalRequest": "2019-01-03T00:00:00",
+                "ApprovalDelay": 30000,
+                "ApprovalDuration": 1000,
+                "Checker": ":",
+                "ExtendedTimeout": 900000,
+                "Expires": "2019-02-05T00:00:00",
+                "LastCheckerStatus": -2,
+            },
+        }
+        return super(TestDumpJSONCmd, self).setUp()
+    def test_normal(self):
+        json_data = json.loads(DumpJSONCmd().output(self.clients))
+        self.assertDictEqual(json_data, self.expected_json)
+    def test_one_client(self):
+        clients = {"foo": self.clients["foo"]}
+        json_data = json.loads(DumpJSONCmd().output(clients))
+        expected_json = {"foo": self.expected_json["foo"]}
+        self.assertDictEqual(json_data, expected_json)
 
 
 def should_only_run_tests():