diff --git a/devstack/README.rst b/devstack/README.rst
index be83ca944..921ec7631 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -17,7 +17,7 @@ How to run FWaaS V2 in DevStack
 Add the following to the localrc section of your local.conf to configure
 FWaaS v2.
 
-.. code-block:: none
+.. code-block:: ini
 
    [[local|localrc]]
    enable_plugin neutron-fwaas https://git.openstack.org/openstack/neutron-fwaas
@@ -27,7 +27,7 @@ To check a specific patchset that is currently under development, use a form
 like the below example, which is checking out change 214350 patch set 14 for
 testing.
 
-.. code-block:: none
+.. code-block:: ini
 
    [[local|localrc]]
    enable_plugin neutron-fwaas https://review.openstack.org/p/openstack/neutron-fwaas refs/changes/50/214350/14
@@ -39,7 +39,7 @@ How to run FWaaS V1 in DevStack
 Add the following to the localrc section of your local.conf to configure
 FWaaS v1.
 
-.. code-block:: none
+.. code-block:: ini
 
    [[local|localrc]]
    enable_plugin neutron-fwaas https://git.openstack.org/openstack/neutron-fwaas
@@ -49,7 +49,7 @@ To check a specific patchset that is currently under development, use a form
 like the below example, which is checking out change 214350 patch set 14 for
 testing.
 
-.. code-block:: none
+.. code-block:: ini
 
    [[local|localrc]]
    enable_plugin neutron-fwaas https://review.openstack.org/p/openstack/neutron-fwaas refs/changes/50/214350/14
diff --git a/test-requirements.txt b/test-requirements.txt
index b72091994..ff121d7b7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,3 +20,4 @@ oslotest>=3.2.0 # Apache-2.0
 PyMySQL>=0.7.6 # MIT License
 psycopg2>=2.6.2 # LGPL/ZPL
 doc8>=0.6.0 # Apache-2.0
+Pygments>=2.2.0 # BSD
diff --git a/tox.ini b/tox.ini
index 126c0b889..cc19a7765 100644
--- a/tox.ini
+++ b/tox.ini
@@ -117,7 +117,6 @@ commands =
   sphinx-build -W -b html doc/source doc/build/html
 
 [doc8]
-ignore = D000
 ignore-path = .venv,.git,.tox,.tmp,*neutron_fwaas/locale*,*lib/python*,neutron_fwaas.egg*,doc/build,releasenotes/*,doc/source/contributor/api
 
 [flake8]