diff --git a/doc/source/conf.py b/doc/source/conf.py
index 960c89cea5..6235c6a661 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -236,7 +236,7 @@ htmlhelp_basename = 'Horizondoc'
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'Horizon.tex', u'Horizon Documentation',
+    ('index', 'doc-horizon.tex', u'Horizon Documentation',
      u'OpenStack Foundation', 'manual'),
 ]
 
@@ -258,8 +258,16 @@ latex_documents = [
 # latex_appendices = []
 
 # If false, no module index is generated.
-# latex_domain_indices = True
+latex_domain_indices = False
 
+latex_elements = {
+    'makeindex': '',
+    'printindex': '',
+    'preamble': r'\setcounter{tocdepth}{3}',
+}
+
+# Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
+latex_use_xindy = False
 
 # -- Options for manual page output -------------------------------------------
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index bf82de7a31..8308975566 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -68,5 +68,7 @@ Information
 
    glossary
 
-* :ref:`genindex`
-* :ref:`modindex`
+.. only:: html
+
+   * :ref:`genindex`
+   * :ref:`modindex`
diff --git a/tox.ini b/tox.ini
index ea571126be..54a8452a55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -126,6 +126,16 @@ deps =
 commands =
   sphinx-build -W -b html doc/source doc/build/html
 
+[testenv:pdf-docs]
+basepython = python3
+envdir = {toxworkdir}/docs
+deps = {[testenv:docs]deps}
+whitelist_externals =
+  make
+commands =
+  sphinx-build -W -b latex doc/source doc/build/pdf
+  make -C doc/build/pdf
+
 [testenv:releasenotes]
 envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}