diff --git a/bin/doom b/bin/doom
index dea9a92d8..60c17a0a5 100755
--- a/bin/doom
+++ b/bin/doom
@@ -257,11 +257,15 @@ SEE ALSO:
 ;; load them lazily.
 (defcli-group!
   :prefix 'doom
+  (defcli-alias! ((version v)) (:root :version))
   ;; Import this for implicit 'X help' commands for your script:
   (defcli-alias! ((help h)) (:root :help))
   ;; And suggest its use when errors occur.
   (add-to-list 'doom-help-commands "%p h[elp] %c")
 
+  (defcli-autoload! ((doctor doc)))
+  (defcli-autoload! (info))
+
   (defcli-group! "Config Management"
     :docs "Commands for maintaining your Doom Emacs configuration."
     (defcli-autoload! ((sync s)))
@@ -279,12 +283,6 @@ SEE ALSO:
     ;; (load! "profile" dir)
     )
 
-  (defcli-group! "Diagnostics"
-    :docs "Commands for troubleshooting and debugging Doom."
-    (defcli-autoload! ((doctor doc)))
-    (defcli-autoload! (info))
-    (defcli-alias! ((version v)) (:root :version)))
-
   (defcli-group! "Development"
     :docs "Commands for developing or launching Doom."
     (defcli-autoload! (ci))