diff --git a/doc/admin-guide-cloud/source/conf.py b/doc/admin-guide-cloud/source/conf.py
index c33ed53add..cc8dbf1b13 100644
--- a/doc/admin-guide-cloud/source/conf.py
+++ b/doc/admin-guide-cloud/source/conf.py
@@ -72,13 +72,11 @@ release = '0.9'
 #   giturl: The location of conf.py on Git. Must be set manually.
 #   gitsha: The SHA checksum of the bug description. Automatically extracted from git log.
 #   bug_tag: Tag for categorizing the bug. Must be set manually.
-#   pwd: source tree - this is needed only for openstackdocstheme <= 1.2.2
 # These variables are passed to the logabug code via html_context.
 giturl = u'http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/admin-guide-cloud/source'
 git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
 gitsha = os.popen(git_cmd).read().strip('\n')
-pwd = os.popen("pwd").read().strip('\n')
-html_context = {"pwd": pwd, "gitsha": gitsha, "bug_tag": bug_tag,
+html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
                 "giturl": giturl}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/doc/contributor-guide/source/conf.py b/doc/contributor-guide/source/conf.py
index 2d8e74339d..a581c3ee4c 100644
--- a/doc/contributor-guide/source/conf.py
+++ b/doc/contributor-guide/source/conf.py
@@ -75,13 +75,11 @@ release = '1.0.0'
 #   giturl: The location of conf.py on Git. Must be set manually.
 #   gitsha: The SHA checksum of the bug description. Automatically extracted from git log.
 #   bug_tag: Tag for categorizing the bug. Must be set manually.
-#   pwd: source tree - this is needed only for openstackdocstheme <= 1.2.2
 # These variables are passed to the logabug code via html_context.
 giturl = u'http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/contributor-guide/source'
 git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
 gitsha = os.popen(git_cmd).read().strip('\n')
-pwd = os.popen("pwd").read().strip('\n')
-html_context = {"pwd": pwd, "gitsha": gitsha, "bug_tag": bug_tag,
+html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
                 "giturl": giturl}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/doc/install-guide/source/conf.py b/doc/install-guide/source/conf.py
index b840582670..3c071440fc 100644
--- a/doc/install-guide/source/conf.py
+++ b/doc/install-guide/source/conf.py
@@ -77,13 +77,11 @@ release = '0.1'
 #   giturl: The location of conf.py on Git. Must be set manually.
 #   gitsha: The SHA checksum of the bug description. Automatically extracted from git log.
 #   bug_tag: Tag for categorizing the bug. Must be set manually.
-#   pwd: source tree - this is needed only for openstackdocstheme <= 1.2.2
 # These variables are passed to the logabug code via html_context.
 giturl = u'http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide/source'
 git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
 gitsha = os.popen(git_cmd).read().strip('\n')
-pwd = os.popen("pwd").read().strip('\n')
-html_context = {"pwd": pwd, "gitsha": gitsha, "bug_tag": bug_tag,
+html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
                 "giturl": giturl}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/doc/networking-guide/source/conf.py b/doc/networking-guide/source/conf.py
index b2e94790bd..58f0f65382 100644
--- a/doc/networking-guide/source/conf.py
+++ b/doc/networking-guide/source/conf.py
@@ -70,13 +70,11 @@ release = '0.9'
 #   giturl: The location of conf.py on Git. Must be set manually.
 #   gitsha: The SHA checksum of the bug description. Automatically extracted from git log.
 #   bug_tag: Tag for categorizing the bug. Must be set manually.
-#   pwd: source tree - this is needed only for openstackdocstheme <= 1.2.2
 # These variables are passed to the logabug code via html_context.
 giturl = u'http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/networking-guide/source'
 git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
 gitsha = os.popen(git_cmd).read().strip('\n')
-pwd = os.popen("pwd").read().strip('\n')
-html_context = {"pwd": pwd, "gitsha": gitsha, "bug_tag": bug_tag,
+html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
                 "giturl": giturl}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/doc/user-guide-admin/source/conf.py b/doc/user-guide-admin/source/conf.py
index 1734157128..e4c3578846 100644
--- a/doc/user-guide-admin/source/conf.py
+++ b/doc/user-guide-admin/source/conf.py
@@ -73,13 +73,11 @@ release = '1.0.0'
 #   giturl: The location of conf.py on Git. Must be set manually.
 #   gitsha: The SHA checksum of the bug description. Automatically extracted from git log. 
 #   bug_tag: Tag for categorizing the bug. Must be set manually.
-#   pwd: source tree - this is needed only for openstackdocstheme <= 1.2.2
 # These variables are passed to the logabug code via html_context.
 giturl = u'http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/user-guide-admin/source'
 git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
 gitsha = os.popen(git_cmd).read().strip('\n')
-pwd = os.popen("pwd").read().strip('\n')
-html_context = {"pwd": pwd, "gitsha": gitsha, "bug_tag": bug_tag,
+html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
                 "giturl": giturl}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/doc/user-guide/source/conf.py b/doc/user-guide/source/conf.py
index 382d4fdf0f..95f111598d 100644
--- a/doc/user-guide/source/conf.py
+++ b/doc/user-guide/source/conf.py
@@ -73,13 +73,11 @@ release = '1.0.0'
 #   giturl: The location of conf.py on Git. Must be set manually.
 #   gitsha: The SHA checksum of the bug description. Automatically extracted from git log.
 #   bug_tag: Tag for categorizing the bug. Must be set manually.
-#   pwd: source tree - this is needed only for openstackdocstheme <= 1.2.2
 # These variables are passed to the logabug code via html_context.
 giturl = u'http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/user-guide/source'
 git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '"
 gitsha = os.popen(git_cmd).read().strip('\n')
-pwd = os.popen("pwd").read().strip('\n')
-html_context = {"pwd": pwd, "gitsha": gitsha, "bug_tag": bug_tag,
+html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
                 "giturl": giturl}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
diff --git a/test-requirements.txt b/test-requirements.txt
index c241f8a124..3294c541ef 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,14 +1,14 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=0.11,<2.0
+pbr>=1.6
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.10.0,<0.11
+hacking>=0.10.2,<0.11
 
 beautifulsoup4
 Jinja2>=2.6  # BSD License (3 clause)
 openstack-doc-tools>=0.30
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-openstackdocstheme>=1.0.7
+openstackdocstheme>=1.2.3
 doc8  # Apache-2.0