diff --git a/etc/ceilometer/ceilometer-config-generator.conf b/etc/ceilometer/ceilometer-config-generator.conf
index dbecc5dda1..69a8d83eae 100644
--- a/etc/ceilometer/ceilometer-config-generator.conf
+++ b/etc/ceilometer/ceilometer-config-generator.conf
@@ -7,4 +7,3 @@ namespace = oslo.concurrency
 namespace = oslo.log
 namespace = oslo.messaging
 namespace = oslo.service.service
-namespace = keystonemiddleware.auth_token
diff --git a/requirements.txt b/requirements.txt
index a77b0e4e7d..b978ac8a37 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,8 +8,6 @@ futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
 futurist>=0.11.0 # Apache-2.0
 debtcollector>=1.2.0 # Apache-2.0
 jsonpath-rw-ext>=0.1.9 # Apache-2.0
-kafka-python>=1.3.2 # Apache-2.0
-keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
 lxml>=2.3 # BSD
 monotonic
 msgpack-python>=0.4.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f516136d67..86af992c68 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,3 +20,4 @@ gabbi>=1.30.0 # Apache-2.0
 requests-aws>=0.1.4 # BSD License (3 clause)
 os-testr>=0.4.1 # Apache-2.0
 tempest>=14.0.0  # Apache-2.0
+kafka-python>=1.3.2 # Apache-2.0