diff --git a/elfeed-db.el b/elfeed-db.el
index 4000a0b..f2e8aeb 100644
--- a/elfeed-db.el
+++ b/elfeed-db.el
@@ -221,7 +221,7 @@ Use `elfeed-db-return' to exit early and optionally return data.
     (do-something entry)
     (when (some-date-criteria-p entry)
       (elfeed-db-return)))"
-  (declare (indent defun))
+  (declare (indent defun) (debug ((symbolp symbolp) body)))
   `(catch 'elfeed-db-done
      (prog1 nil
        (elfeed-db-ensure)
@@ -254,6 +254,7 @@ The FEED-OR-ID may be a feed struct or a feed ID (url)."
 
 (defmacro elfeed-db-return (&optional value)
   "Use this to exit early and return VALUE from `with-elfeed-db-visit'."
+  (declare (debug (&optional sexp)))
   `(throw 'elfeed-db-done ,value))
 
 (defun elfeed-db-get-all-tags ()
diff --git a/elfeed-search.el b/elfeed-search.el
index d1d9b57..b10734b 100644
--- a/elfeed-search.el
+++ b/elfeed-search.el
@@ -687,7 +687,7 @@ expression, matching against entry link, title, and feed title."
 
 (defmacro elfeed-save-excursion (&rest body)
   "Like `save-excursion', but by entry/line/column instead of point."
-  (declare (indent defun))
+  (declare (indent defun) (debug t))
   `(let ((entry (elfeed-search-selected :single))
          (line (line-number-at-pos))
          (column (current-column)))
diff --git a/elfeed.el b/elfeed.el
index bbfef26..81feb3d 100644
--- a/elfeed.el
+++ b/elfeed.el
@@ -162,7 +162,7 @@ list. The second argument is the tag list.")
 This macro is anaphoric, with STATUS referring to the status from
 `url-retrieve'/cURL and USE-CURL being the original invoked-value
 of `elfeed-use-curl'."
-  (declare (indent defun))
+  (declare (indent defun) (debug (&define sexp def-body)))
   `(let* ((use-curl elfeed-use-curl) ; capture current value in closure
           (cb (lambda (status) ,@body)))
      (if elfeed-use-curl
diff --git a/tests/elfeed-db-tests.el b/tests/elfeed-db-tests.el
index 538b627..24ba667 100644
--- a/tests/elfeed-db-tests.el
+++ b/tests/elfeed-db-tests.el
@@ -62,7 +62,7 @@
 
 (defmacro with-elfeed-test (&rest body)
   "Run BODY with a fresh, empty database that will be destroyed on exit."
-  (declare (indent defun))
+  (declare (indent defun) (debug t))
   `(let* ((elfeed-db nil)
           (elfeed-db-feeds nil)
           (elfeed-db-entries nil)
diff --git a/tests/elfeed-search-tests.el b/tests/elfeed-search-tests.el
index cd70a65..0f0d6d9 100644
--- a/tests/elfeed-search-tests.el
+++ b/tests/elfeed-search-tests.el
@@ -4,6 +4,7 @@
 (require 'elfeed-search)
 
 (defmacro test-search-parse-filter-duration (filter after-days &optional before-days)
+  (declare (debug (stringp numberp &optional numberp)))
   (let ((day (* 24 60 60)))
     `(should (equal ',(cl-concatenate 'list
                                       (when before-days
diff --git a/web/elfeed-web.el b/web/elfeed-web.el
index 593fcce..dece12f 100644
--- a/web/elfeed-web.el
+++ b/web/elfeed-web.el
@@ -114,7 +114,7 @@
 
 (defmacro with-elfeed-web (&rest body)
   "Only execute BODY if `elfeed-web-enabled' is true."
-  (declare (indent 0))
+  (declare (indent 0) (debug t))
   `(if (not elfeed-web-enabled)
        (progn
          (princ (json-encode '(:error 403)))