killbill-aplcache

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/KillBillApiDefinition.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/KillBillApiDefinition.java
index 2e864b2..90b1d57 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/KillBillApiDefinition.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/KillBillApiDefinition.java
@@ -120,7 +120,12 @@ public class KillBillApiDefinition implements ReaderListener {
                                qp.getName().equals(JaxrsResource.QUERY_START_DATE) ||
                                qp.getName().equals(JaxrsResource.QUERY_END_DATE)) {
                         qp.setType("string");
-                        qp.setFormat("date");
+                        // Yack... See #922
+                        if (op.getOperationId().equals("getCatalogJson") || op.getOperationId().equals("setTestClockTime")) {
+                            qp.setFormat("date-time");
+                        } else {
+                            qp.setFormat("date");
+                        }
                     }
                 }
             }