diff --git a/doc/source/conf.py b/doc/source/conf.py
index aed755ee..799af29a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -188,10 +188,13 @@ htmlhelp_basename = 'BlazarDoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'blazardoc.tex', u'Blazar',
+    ('index', 'doc-blazar.tex', u'Blazar Documentation',
      u'OpenStack Foundation', 'manual'),
 ]
 
+# Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
+latex_use_xindy = False
+
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
 #latex_logo = None
diff --git a/tox.ini b/tox.ini
index a9e7444d..803504b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,11 +33,23 @@ commands = {posargs}
 
 [testenv:docs]
 basepython = python3
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
 commands =
     rm -rf doc/html doc/build
     rm -rf doc/source/apidoc doc/source/api
     python setup.py build_sphinx
 
+[testenv:pdf-docs]
+basepython = python3
+deps = {[testenv:docs]deps}
+whitelist_externals = make
+commands =
+    sphinx-build -b latex doc/source doc/build/pdf
+    make -C doc/build/pdf
+
 [testenv:genconfig]
 basepython = python3
 commands = oslo-config-generator --config-file=etc/blazar/blazar-config-generator.conf