diff --git a/security-guide-rst/source/data-processing/case-studies.rst b/security-guide-rst/source/data-processing/case-studies.rst
index ba468de2..469865b7 100644
--- a/security-guide-rst/source/data-processing/case-studies.rst
+++ b/security-guide-rst/source/data-processing/case-studies.rst
@@ -2,7 +2,8 @@
 Case studies
 ============
 
-.. TODO (elmiko) fixup the introduction chapter link to point to case studies intro
+.. TODO (elmiko) fixup the introduction chapter link to point to case studies
+   intro
 
 Continuing with the studies described in :doc:`../introduction`, we
 present Alice and Bob's approaches to deploying the Data
diff --git a/security-guide-rst/source/data-processing/configuration-and-hardening.rst b/security-guide-rst/source/data-processing/configuration-and-hardening.rst
index 4dfe847e..009cd71c 100644
--- a/security-guide-rst/source/data-processing/configuration-and-hardening.rst
+++ b/security-guide-rst/source/data-processing/configuration-and-hardening.rst
@@ -15,7 +15,8 @@ TLS
 The Data processing service controller, like many other OpenStack
 controllers, can be configured to require TLS connections.
 
-.. TODO (elmiko) fixup secure communication chapter link to point to tls proxies section
+.. TODO (elmiko) fixup secure communication chapter link to point to tls
+   proxies section
 
 Pre-Kilo releases will require a TLS proxy as the controller does not
 allow direct TLS connections. Configuring TLS proxies is
@@ -90,7 +91,8 @@ used if requested, or an automated option exists which instructs the
 service to create a security group based on ports specified by the
 framework being accessed.
 
-.. TODO (elmiko) fixup networking chapter link to point to security groups section
+.. TODO (elmiko) fixup networking chapter link to point to security groups
+   section
 
 For production environments we recommend controlling the security
 groups manually and creating a set of group rules that are appropriate
diff --git a/security-guide-rst/source/instance-management/case-studies.rst b/security-guide-rst/source/instance-management/case-studies.rst
index 0730a231..8bf87efb 100644
--- a/security-guide-rst/source/instance-management/case-studies.rst
+++ b/security-guide-rst/source/instance-management/case-studies.rst
@@ -2,7 +2,8 @@
 Case studies
 ============
 
-.. TODO (elmiko) fixup the introduction chapter link to point to case studies intro
+.. TODO (elmiko) fixup the introduction chapter link to point to case studies
+   intro
 
 Earlier in :doc:`../introduction` we introduced the Alice and Bob case
 studies where Alice is deploying a private government cloud and Bob is
@@ -14,7 +15,8 @@ instance migrations.
 Alice's private cloud
 ~~~~~~~~~~~~~~~~~~~~~
 
-.. TODO (elmiko) fixup the management chapter link to point to case studies section
+.. TODO (elmiko) fixup the management chapter link to point to case studies
+   section
 
 Earlier in :doc:`../management`,
 Alice issued a Request for Product (or RFP) to major hardware
diff --git a/security-guide-rst/source/instance-management/security-services-for-instances.rst b/security-guide-rst/source/instance-management/security-services-for-instances.rst
index dd5080a2..39ff0a0d 100644
--- a/security-guide-rst/source/instance-management/security-services-for-instances.rst
+++ b/security-guide-rst/source/instance-management/security-services-for-instances.rst
@@ -286,7 +286,8 @@ following lines to the nova :file:`policy.json` file:
 Migration network
 -----------------
 
-.. TODO (elmiko) fixup introduction doc link to point to the security boundaries and threats section
+.. TODO (elmiko) fixup introduction doc link to point to the security
+   boundaries and threats section
 
 As a general practice, live migration traffic should be restricted
 to the management security domain, see :doc:`../introduction`.
diff --git a/tox.ini b/tox.ini
index 86a89e7b..2f96257b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,7 @@ commands = openstack-doc-test --check-links {posargs}
 commands =
      openstack-doc-test --check-niceness {posargs}
      doc8 -e '' security-notes
+     doc8 -e '' security-guide-rst
 
 [testenv:checksyntax]
 commands =
@@ -84,7 +85,7 @@ commands =
 [doc8]
 # Settings for doc8:
 # This file has extra long lines that cannot be avoided, let's white list it.
-ignore-path = security-notes/OSSN-0047,doc/security-guide-rst/source/imported
+ignore-path = security-notes/OSSN-0047,security-guide-rst/source/imported
 # File extensions to use
 extensions = .rst,.txt
 # Disable some doc8 checks: