diff --git a/pytest.ini b/pytest.ini
index 7ca06444fcbc..24581de34526 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -10,12 +10,11 @@ markers =
 pep8ignore =
     * E111 E114 E115 E116 E121 E122 E123 E124 E125 E126 E127 E128 E129 E131 E226 E240 E241 E242 E243 E244 E245 E246 E247 E248 E249 E265 E266 E704 W503
 
-    boilerplate.py E501
+    tools/boilerplate.py E501
     setup.py E402 E501
     setupext.py E301 E302 E501
     setup_external_compile.py E302 E501 E711
     versioneer.py ALL  # External file.
-
     tools/gh_api.py ALL  # External file.
     tools/github_stats.py ALL  # External file.
     tools/subset.py E221 E231 E251 E261 E302 E501 E701 E703
diff --git a/tools/README.txt b/tools/README.txt
new file mode 100644
index 000000000000..d6438c7654f0
--- /dev/null
+++ b/tools/README.txt
@@ -0,0 +1 @@
+Tools developed for Matplotlib
diff --git a/boilerplate.py b/tools/boilerplate.py
similarity index 99%
rename from boilerplate.py
rename to tools/boilerplate.py
index 6aabc83cb892..5c34b4f869f2 100644
--- a/boilerplate.py
+++ b/tools/boilerplate.py
@@ -365,7 +365,7 @@ def format_value(value):
 
 
 def build_pyplot():
-    pyplot_path = os.path.join(os.path.dirname(__file__), 'lib',
+    pyplot_path = os.path.join(os.path.dirname(__file__), "..", 'lib',
                                'matplotlib', 'pyplot.py')
 
     pyplot_orig = open(pyplot_path, 'r').readlines()