diff --git a/doc/source/conf.py b/doc/source/conf.py
index 85dd81ef..a8ad3ad7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -181,7 +181,7 @@ htmlhelp_basename = 'SwiftClientwebdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual])
 latex_documents = [
-    ('index', 'SwiftClient.tex', u'SwiftClient Documentation',
+    ('index', 'doc-python-swiftclient.tex', u'SwiftClient Documentation',
      u'OpenStack, LLC.', 'manual'),
 ]
 
@@ -201,3 +201,5 @@ latex_documents = [
 
 # If false, no module index is generated.
 # latex_use_modindex = True
+
+latex_use_xindy = False
diff --git a/tox.ini b/tox.ini
index a2b63b3f..7dd864b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -109,3 +109,12 @@ deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   .[keystone]
+
+[testenv:pdf-docs]
+basepython = python3
+deps = {[testenv:docs]deps}
+whitelist_externals =
+  make
+commands =
+  sphinx-build -W -b latex doc/source doc/build/pdf
+  make -C doc/build/pdf