diff --git a/README.rst b/README.rst
index 9a45704b..58844374 100644
--- a/README.rst
+++ b/README.rst
@@ -103,8 +103,8 @@ Set up Grafana 4.1
    ``grafana/plugins/monasca-grafana-datasource/``.
 -  Use the grafana docs to build and deploy grafana:
 
-   -  http://docs.grafana.org/project/building_from_source/
-   -  http://docs.grafana.org/installation/configuration/
+   -  https://grafana.com/docs/project/building_from_source/
+   -  https://grafana.com/docs/installation/configuration/
 
 -  Copy ``monasca-ui/grafana-dashboards/*`` to ``/public/dashboards/``
    in your grafana deployment.
@@ -145,4 +145,4 @@ directory of this project:
 
 ::
 
-   $ tox -e py27,py35
+   $ tox -e py27,py36
diff --git a/test-requirements.txt b/test-requirements.txt
index 573bff3a..602b5600 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD
diff --git a/tox.ini b/tox.ini
index 674655a0..f479c1cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,6 +41,9 @@ basepython = python3
 commands = /bin/bash run_tests.sh -N --coverage {posargs}
 
 [flake8]
+# F405 TEMPLATES may be undefined, or defined from star imports
+# (because it is not easy to avoid this in openstack_dashboard.test.settings)
+ignore = F405
 max-line-length = 100
 builtins = _
 exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py,*/local/*,*/test/test_plugins/*