diff --git a/bin/ceilometer-test-event.py b/tools/ceilometer-test-event.py
similarity index 100%
rename from bin/ceilometer-test-event.py
rename to tools/ceilometer-test-event.py
diff --git a/tox.ini b/tox.ini
index 052db877..130d41a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,7 +42,6 @@ commands = bash -x {toxinidir}/setup-test-env-mongodb.sh python setup.py testr -
 [testenv:pep8]
 commands =
     flake8
-    flake8 --filename=ceilometer-* bin
     # Check that .po and .pot files are valid:
     bash -c "find ceilometer -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"