diff --git a/README.rst b/README.rst
index 6a5179ed5..5b2d329e0 100644
--- a/README.rst
+++ b/README.rst
@@ -89,7 +89,7 @@ Please use the `GitHub issue tracker <https://github.com/pytest-dev/pytest/issue
 Changelog
 ---------
 
-Consult the `Changelog <http://docs.pytest.org/en/latest/changelog.html>`_ page for fixes and enhancements of each version.
+Consult the `Changelog <http://docs.pytest.org/en/latest/changelog.html>`__ page for fixes and enhancements of each version.
 
 
 License
diff --git a/tox.ini b/tox.ini
index bbf300ce3..76b92aa53 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,8 +42,6 @@ deps=pytest-xdist>=1.13
 commands=
   pytest -n3 -rfsxX --runpytest=subprocess {posargs:testing}
 
-[testenv:genscript]
-commands= pytest --genscript=pytest1
 
 [testenv:linting]
 basepython = python2.7
@@ -54,7 +52,7 @@ deps =
 commands =
     check-manifest
     flake8 pytest.py _pytest testing
-    rst-lint CHANGELOG.rst HOWTORELEASE.rst
+    rst-lint CHANGELOG.rst HOWTORELEASE.rst README.rst
 
 [testenv:py27-xdist]
 deps=pytest-xdist>=1.13