                 response (test-app request)]
             (is (= 404 (:status response)))))
 
-        (testing "tolerates 'Accept: pson' header"
+        (testing "honors 'Accept: pson' header"
           (let [request {:uri "/production/certificate_status/localhost"
                          :request-method :get
                          :headers {"accept" "pson"}}
                 response (test-app request)]
             (is (= 200 (:status response))
-                (ks/pprint-to-string response))))
-
-        (testing "tolerates 'Accept: text/pson' header"
+                (ks/pprint-to-string response))
+            (is (.startsWith (get-in response [:headers "Content-Type"]) "text/pson"))))
+
+        (testing "honors 'Accept: text/pson' header"
           (let [request {:uri "/production/certificate_status/localhost"
                          :request-method :get
                          :headers {"accept" "text/pson"}}
                 response (test-app request)]
             (is (= 200 (:status response))
                 (ks/pprint-to-string response))
-            (is (.startsWith (get-in response [:headers "Content-Type"]) "text/pson")))))
+            (is (.startsWith (get-in response [:headers "Content-Type"]) "text/pson"))))
+
+        (testing "honors 'Accept: application/json' header"
+          (let [request {:uri "/production/certificate_status/localhost"
+                         :request-method :get
+                         :headers {"accept" "application/json"}}
+                response (test-app request)]
+            (is (= 200 (:status response))
+                (ks/pprint-to-string response))
+            (is (.startsWith (get-in response [:headers "Content-Type"]) "application/json")))))
 
       (testing "GET /certificate_statuses"
         (let [response (test-app

                         :headers {"accept" "text/pson"}})]
          (is (= 200 (:status response)))
          (is (.startsWith (get-in response [:headers "Content-Type"]) "text/pson"))
          (is (= #{localhost-status test-agent-status revoked-agent-status}
                 (set (json/parse-string (:body response) true)))))))))


                         :request-method :get
                         :headers {"accept" "pson"}})]
          (is (= 200 (:status response)))
          (is (.startsWith (get-in response [:headers "Content-Type"]) "text/pson"))
          (is (= #{localhost-status test-agent-status revoked-agent-status}
                 (set (json/parse-string (:body response) true))))))

