diff --git a/debian/control b/debian/control
index 048de22..2ccacd6 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,6 @@ Build-Depends-Indep: python-coverage,
                      python3-oslo.i18n (>= 1.5.0),
                      python3-oslo.serialization (>= 1.4.0),
                      python3-oslo.utils (>= 1.4.0),
-                     python3-oslosphinx (>= 2.5.0),
                      python3-prettytable,
                      python3-requests,
                      python3-six (>= 1.9.0),
@@ -94,7 +93,7 @@ Depends: python3-iso8601,
          python3-six (>= 1.9.0),
          python3-stevedore (>= 1.3.0),
          ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
 Suggests: python-ceilometerclient-doc
 Description: Client library for Openstack Ceilometer API server - Python 3.x
  Ceilometer aims to deliver a unique point of contact for billing systems to
@@ -110,7 +109,8 @@ Description: Client library for Openstack Ceilometer API server - Python 3.x
  .
  This package contains the Python 3.x module.
 
-Package: python3-ceilometerclient
+Package: python-ceilometerclient-doc
+Section: doc
 Architecture: all
 Depends: ${misc:Depends},
          ${sphinxdoc:Depends},
diff --git a/debian/python-ceilometerclient.doc-base b/debian/python-ceilometerclient-doc.doc-base
similarity index 52%
rename from debian/python-ceilometerclient.doc-base
rename to debian/python-ceilometerclient-doc.doc-base
index 01969ce..b2aa746 100644
--- a/debian/python-ceilometerclient.doc-base
+++ b/debian/python-ceilometerclient-doc.doc-base
@@ -1,9 +1,9 @@
-Document: pythonceilometerclient-doc
+Document: python-ceilometerclient-doc
 Title: Python Ceilometer Client Documentation
 Author: OpenStack Foundation
 Abstract: Sphinx documentation for Python Ceilometer Client
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-ceilometerclient/html/index.html
-Files: /usr/share/doc/python-ceilometerclient/html/*
+Index: /usr/share/doc/python-ceilometerclient-doc/html/index.html
+Files: /usr/share/doc/python-ceilometerclient-doc/html/*
diff --git a/debian/python-ceilometerclient.postinst b/debian/python-ceilometerclient.postinst
new file mode 100644
index 0000000..41c59be
--- /dev/null
+++ b/debian/python-ceilometerclient.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+	update-alternatives --install /usr/bin/ceilometer ceilometer /usr/bin/python2-ceilometer 300
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/python-ceilometerclient.postrm b/debian/python-ceilometerclient.postrm
new file mode 100644
index 0000000..3f8dc65
--- /dev/null
+++ b/debian/python-ceilometerclient.postrm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
+	update-alternatives --remove ceilometer /usr/bin/python2-ceilometer
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/python-ceilometerclient.prerm b/debian/python-ceilometerclient.prerm
new file mode 100644
index 0000000..a354462
--- /dev/null
+++ b/debian/python-ceilometerclient.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] ; then
+	update-alternatives --remove ceilometer /usr/bin/python2-ceilometer
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/python3-ceilometerclient.postinst b/debian/python3-ceilometerclient.postinst
new file mode 100644
index 0000000..cf4ac33
--- /dev/null
+++ b/debian/python3-ceilometerclient.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+	update-alternatives --install /usr/bin/ceilometer ceilometer /usr/bin/python3-ceilometer 200
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/python3-ceilometerclient.postrm b/debian/python3-ceilometerclient.postrm
new file mode 100644
index 0000000..8cfe90a
--- /dev/null
+++ b/debian/python3-ceilometerclient.postrm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
+	update-alternatives --remove ceilometer /usr/bin/python3-ceilometer
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/python3-ceilometerclient.prerm b/debian/python3-ceilometerclient.prerm
new file mode 100644
index 0000000..81f90d3
--- /dev/null
+++ b/debian/python3-ceilometerclient.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] ; then
+	update-alternatives --remove ceilometer /usr/bin/python3-ceilometer
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 74a1389..b2c0d00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,21 +16,24 @@ override_dh_install:
 	set -e ; for pyvers in $(PYTHONS); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/python-ceilometerclient; \
+	done
 	set -e ; for pyvers in $(PYTHON3S); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/python3-ceilometerclient; \
 	done
+	mv $(CURDIR)/debian/python-ceilometerclient/usr/bin/ceilometer $(CURDIR)/debian/python-ceilometerclient/usr/bin/python2-ceilometer
+	mv $(CURDIR)/debian/python3-ceilometerclient/usr/bin/ceilometer $(CURDIR)/debian/python3-ceilometerclient/usr/bin/python3-ceilometer
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	@echo "===> Running tests"
-	set -e ; set -x ; for i in 2.7 $(PYTHON3S) ; do \
+	set -e ; set -x ; for i in 2.7 3.4 ; do \
 		PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
 		echo "===> Testing with python$$i (python$$PYMAJOR)" ; \
 		rm -rf .testrepository ; \
 		testr-python$$PYMAJOR init ; \
 		TEMP_REZ=`mktemp -t` ; \
-		PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'oslo_utils.*' | tee $$TEMP_REZ | subunit2pyunit ; \
+		PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit | tee $$TEMP_REZ | subunit2pyunit ; \
 		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
 		rm -f $$TEMP_REZ ; \
 		testr-python$$PYMAJOR slowest ; \