diff --git a/bin/ceilometer-send-counter b/bin/ceilometer-send-counter
index 9cb93ea85..6bf235166 100755
--- a/bin/ceilometer-send-counter
+++ b/bin/ceilometer-send-counter
@@ -24,7 +24,6 @@ import logging
 import sys
 
 from oslo.config import cfg
-from stevedore import dispatch
 
 from ceilometer import counter
 from ceilometer import pipeline
diff --git a/tox.ini b/tox.ini
index cd7c44510..f47e2990d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,8 @@ deps = pep8==1.4.5
        flake8==2.0
        hacking>=0.5.3,<0.6
 commands =
-    flake8 ceilometer setup.py tests
+    flake8
+    flake8 --filename=ceilometer-* bin
 
 [testenv:docs]
 deps = -r{toxinidir}/requirements.txt