diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-state.json b/doc/api_samples/os-admin-actions/admin-actions-reset-state.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/doc/api_samples/os-certificates/certificate-create-req.json b/doc/api_samples/os-certificates/certificate-create-req.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json b/doc/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json
index 934ed21b20ca..77b8fdb6befb 100644
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json
+++ b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.json
@@ -1,7 +1,6 @@
 {
-  'dns_entry' :
-    {
-      'ip': '192.168.53.11',
-      'dns_type': 'A'
-    }
+  "dns_entry": {
+    "ip": "192.168.53.11",
+    "dns_type": "A"
+  }
 }
\ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json
index 05aac422daf2..2d517ff2c0b7 100644
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json
+++ b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json
@@ -1,8 +1,7 @@
 {
-  'domain_entry' :
-    {
-      'domain': 'domain1.example.org',
-      'scope': 'public',
-      'project': 'project1'
-   }
+  "domain_entry": {
+    "domain": "domain1.example.org",
+    "scope": "public",
+    "project": "project1"
+  }
 }
\ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.json b/doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/doc/api_samples/os-hide-server-addresses/server-post-req.json b/doc/api_samples/os-hide-server-addresses/server-post-req.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/doc/v3/api_samples/consoles/consoles-create-req.json b/doc/v3/api_samples/consoles/consoles-create-req.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/doc/v3/api_samples/os-availability-zone/server-post-req.json b/doc/v3/api_samples/os-availability-zone/server-post-req.json
index 462360ec4a2d..021b8d2f1b9a 100644
--- a/doc/v3/api_samples/os-availability-zone/server-post-req.json
+++ b/doc/v3/api_samples/os-availability-zone/server-post-req.json
@@ -3,7 +3,7 @@
         "name" : "new-server-test",
         "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
         "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
-        "availability_zone" : "test"
+        "availability_zone" : "test",
         "metadata" : {
             "My Server Name" : "Apache1"
         }
diff --git a/doc/v3/api_samples/os-certificates/certificate-create-req.json b/doc/v3/api_samples/os-certificates/certificate-create-req.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json b/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json
index d5403b7d8862..cdc4849b5b6f 100644
--- a/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json
+++ b/doc/v3/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json
@@ -1,6 +1,6 @@
 {
     "floating_ips_bulk_create": {
-        "ip_range": "192.168.1.0/24"
+        "ip_range": "192.168.1.0/24",
         "pool": "nova",
         "interface": "eth0"
     }
diff --git a/doc/v3/api_samples/os-floating-ips/floating-ips-create-nopool-req.json b/doc/v3/api_samples/os-floating-ips/floating-ips-create-nopool-req.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/doc/v3/api_samples/os-server-external-events/event-create-req.json b/doc/v3/api_samples/os-server-external-events/event-create-req.json
index 215c3efd4a13..8cd7ce2b0500 100644
--- a/doc/v3/api_samples/os-server-external-events/event-create-req.json
+++ b/doc/v3/api_samples/os-server-external-events/event-create-req.json
@@ -1,9 +1,10 @@
 {
-    "events": {[
-     {
-        "name": "test-event",
-        "tag": "foo",
-        "status": "completed",
-        "server_uuid": "3df201cf-2451-44f2-8d25-a4ca826fc1f3"
-     }]}
-}
+    "events": [
+        {
+            "name": "test-event",
+            "tag": "foo",
+            "status": "completed",
+            "server_uuid": "3df201cf-2451-44f2-8d25-a4ca826fc1f3"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 74d7d469a14c..cb15a3b041ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -59,7 +59,9 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands =
+  python setup.py build_sphinx
+  bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'
 
 [flake8]
 # E125 is deliberately excluded. See https://github.com/jcrocholl/pep8/issues/126