diff --git a/doc/source/conf.py b/doc/source/conf.py
index 19ede311b380..501ab34c4096 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -123,8 +123,6 @@ man_pages = [
      [u'OpenStack'], 1),
     ('man/nova-cells', 'nova-cells', u'Cloud controller fabric',
      [u'OpenStack'], 1),
-    ('man/nova-cert', 'nova-cert', u'Cloud controller fabric',
-     [u'OpenStack'], 1),
     ('man/nova-compute', 'nova-compute', u'Cloud controller fabric',
      [u'OpenStack'], 1),
     ('man/nova-console', 'nova-console', u'Cloud controller fabric',
diff --git a/setup.cfg b/setup.cfg
index 507955b5d3f9..43de2b2374af 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -49,7 +49,6 @@ console_scripts =
     nova-api-metadata = nova.cmd.api_metadata:main
     nova-api-os-compute = nova.cmd.api_os_compute:main
     nova-cells = nova.cmd.cells:main
-    nova-cert = nova.cmd.cert:main
     nova-compute = nova.cmd.compute:main
     nova-conductor = nova.cmd.conductor:main
     nova-console = nova.cmd.console:main