diff --git a/.zuul.yaml b/.zuul.yaml
index 3fbd4567cb..357d6e830c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -277,7 +277,9 @@
               - ^test/(functional|probe)/.*$
         - openstack-tox-pep8:
             irrelevant-files:
-              - ^(api-ref|doc|etc|examples|releasenotes)/.*$
+              - ^(api-ref|etc|examples|releasenotes)/.*$
+              # Keep doc/manpages -- we want to syntax check them
+              - ^doc/(requirements.txt|(saio|s3api|source)/.*)$
     gate:
       jobs:
         # For gate jobs, err towards running more jobs (so, generally avoid
@@ -311,7 +313,9 @@
         - openstack-tox-lower-constraints
         - openstack-tox-pep8:
             irrelevant-files:
-              - ^(api-ref|doc|etc|examples|releasenotes)/.*$
+              - ^(api-ref|etc|examples|releasenotes)/.*$
+              # Keep doc/manpages -- we want to syntax check them
+              - ^doc/(requirements.txt|(saio|s3api|source)/.*)$
     experimental:
       jobs:
         - swift-tox-py27-centos-7
diff --git a/bindep.txt b/bindep.txt
index 1dbb87c1a5..562f8b7e59 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -36,3 +36,5 @@ openssl-dev [platform:apk]
 libopenssl-devel [platform:suse]
 py-cffi [platform:apk]
 musl-dev [platform:apk]
+man-db [pep8]
+man [platform:rpm pep8]
diff --git a/doc/manpages/swift-recon.1 b/doc/manpages/swift-recon.1
index 40be51ea79..c5a30b6d47 100644
--- a/doc/manpages/swift-recon.1
+++ b/doc/manpages/swift-recon.1
@@ -129,7 +129,7 @@ cronjob to run the swift-recon-cron script periodically:
 More documentation about OpenStack Swift can be found at
 .BI https://docs.openstack.org/swift/latest/
 Also more specific documentation about swift-recon can be found at
-.BI https://docs.openstack.org/swift/latest/admin_guide.html#cluster-telemetry-and-monitoring
+.BI https://docs.openstack.org/swift/latest/admin_guide.html\#cluster-telemetry-and-monitoring
 
 
 
diff --git a/tox.ini b/tox.ini
index 3ef1d1f147..bec2e7cf85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -70,6 +70,7 @@ commands =
   flake8 --filename=swift* bin
   bandit -c bandit.yaml -r swift -n 5
   python ./setup.py check --restructuredtext --strict
+  ./.manpages {posargs}
 
 [testenv:py3pep8]
 basepython = python3
@@ -82,6 +83,7 @@ commands =
   flake8 swift test doc setup.py
   flake8 --filename=swift* bin
   python ./setup.py check --restructuredtext --strict
+  ./.manpages {posargs}
 
 [testenv:func]
 basepython = python2.7
@@ -147,6 +149,7 @@ show-source = True
 # system dependencies are missing, since it's used to tell you what system
 # dependencies are missing! This also means that bindep must be installed
 # separately, outside of the requirements files.
+skip_install = True
 deps = bindep
 commands = bindep test