diff --git a/test-requirements.txt b/test-requirements.txt
index 64a83f3178..2ae87618ce 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,7 @@
 # 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.
+beautifulsoup4
 Jinja2
 doc8  # Apache-2.0
 openstack-doc-tools>=0.20
diff --git a/tools/www-generator.py b/tools/www-generator.py
index f5945a1dab..422643fe3a 100755
--- a/tools/www-generator.py
+++ b/tools/www-generator.py
@@ -19,6 +19,7 @@ import logging
 import os
 import sys
 
+from bs4 import BeautifulSoup
 import jinja2
 
 
@@ -82,6 +83,8 @@ def main():
 
         try:
             output = template.render()
+            soup = BeautifulSoup(output)
+            output = soup.prettify()
         except Exception as e:
             logger.error("rendering template %s failed: %s" %
                          (templateFile, e))