diff --git a/doc/source/cli/plugin-commands/aodh.rst b/doc/source/cli/plugin-commands/aodh.rst
deleted file mode 100644
index 5d8b4332cf..0000000000
--- a/doc/source/cli/plugin-commands/aodh.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-aodh
-----
-
-.. autoprogram-cliff:: openstack.alarming.v2
diff --git a/doc/source/cli/plugin-commands/index.rst b/doc/source/cli/plugin-commands/index.rst
index 4e1ce54b13..638dcbe560 100644
--- a/doc/source/cli/plugin-commands/index.rst
+++ b/doc/source/cli/plugin-commands/index.rst
@@ -7,7 +7,6 @@ Plugin Commands
 .. toctree::
    :maxdepth: 1
 
-   aodh
    barbican
    designate
    gnocchi
@@ -29,6 +28,10 @@ Plugin Commands
 
 .. TODO(efried): Make pages for the following once they're fixed.
 
+.. aodh
+.. # aodhclient docs build is failing with recent pyparsing
+.. # autoprogram-cliff:: openstack.alarming.v2
+
 .. cue
 .. # cueclient is not in global-requirements
 .. # list-plugins:: openstack.mb.v1