diff --git a/lib/ceilometer_utils.py b/lib/ceilometer_utils.py
index 9ed813c..280cd54 100644
--- a/lib/ceilometer_utils.py
+++ b/lib/ceilometer_utils.py
@@ -213,6 +213,7 @@ def register_configs():
     if CompareOpenStackReleases(release) >= 'queens':
         for conf in QUEENS_CONFIG_FILES:
             configs.register(conf, QUEENS_CONFIG_FILES[conf]['hook_contexts'])
+        configs.register(PIPELINE_CONF, [RemoteSinksContext()])
     else:
         for conf in (CEILOMETER_CONF, HAPROXY_CONF):
             configs.register(conf, CONFIG_FILES[conf]['hook_contexts'])
diff --git a/test-requirements.txt b/test-requirements.txt
index 9edd4bb..1ba8187 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -25,3 +25,10 @@ distro-info
 # END: Amulet OpenStack Charm Helper Requirements
 # NOTE: workaround for 14.04 pip/tox
 pytz
+# Temporary fix to cmd2 dep issues:
+# Root of the issue is a release blunder by a upstream dependency:
+# python-cmd2/cmd2#421
+# Upstream has made the same change to global requirements here:
+# https://review.openstack.org/#/c/570811
+# We can remove this again as soon as changes propagate out to all dependencies.
+cmd2!=0.8.3,<0.9.0  # MIT