diff --git a/.travis.yml b/.travis.yml
index 6abe79e581ad2d84e57c76a729c82f04510feaac..75f0ebc1e9ce87598765c38c396e8afe5e4ecc46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ env:
   - TOXENV=py33 SODIUM_INSTALL=system CC=clang
   - TOXENV=pypy SODIUM_INSTALL=system CC=clang
   - TOXENV=docs
-  - TOXENV=pep8
+  - TOXENV=meta
 
 install:
   # Add the PyPy repository
diff --git a/tox.ini b/tox.ini
index 0d81ee4491ea92fbd40c36b9976f9fa786d00956..b12e47ca3da5cf345887a1daef44ed70508cfd55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py32,py33,docs,pep8
+envlist = py26,py27,pypy,py32,py33,docs,meta
 
 [testenv]
 deps =
@@ -19,9 +19,13 @@ commands =
     sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs docs/_build/html
     sphinx-build -W -b linkcheck docs docs/_build/html
 
-[testenv:pep8]
-deps = flake8
-commands = flake8 .
+[testenv:meta]
+deps =
+    flake8
+    check-manifest
+commands =
+    flake8 .
+    check-manifest . --ignore .travis.yml
 
 [flake8]
 select = E,W,F