diff --git a/debian/changelog b/debian/changelog
index 157e7f9..44b7b55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 python-tempest-lib (0.5.0-2) UNRELEASED; urgency=medium
 
+  [ James Page ]
   * Cherry pick patch from upstream VCS to switch to using os-testr,
     add os-testr to (build-)depends.
 
- -- James Page <james.page@ubuntu.com>  Tue, 23 Jun 2015 10:29:26 +0100
+  [ Thomas Goirand ]
+  * Removed installation of subunit-trace, now in python-os-testr.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 07 Jul 2015 23:37:34 +0200
 
 python-tempest-lib (0.5.0-1) experimental; urgency=medium
 
diff --git a/debian/python-tempest-lib.postinst b/debian/python-tempest-lib.postinst
index b8b560a..dfda085 100644
--- a/debian/python-tempest-lib.postinst
+++ b/debian/python-tempest-lib.postinst
@@ -3,7 +3,6 @@
 set -e
 
 if [ "$1" = "configure" ] ; then
-	update-alternatives --install /usr/bin/subunit-trace subunit-trace /usr/bin/python2-subunit-trace 300
 	update-alternatives --install /usr/bin/skip-tracker skip-tracker /usr/bin/python2-skip-tracker 300
 fi
 
diff --git a/debian/python3-tempest-lib.postinst b/debian/python3-tempest-lib.postinst
index 54e79d2..675211b 100644
--- a/debian/python3-tempest-lib.postinst
+++ b/debian/python3-tempest-lib.postinst
@@ -3,7 +3,6 @@
 set -e
 
 if [ "$1" = "configure" ] ; then
-	update-alternatives --install /usr/bin/subunit-trace subunit-trace /usr/bin/python3-subunit-trace 200
 	update-alternatives --install /usr/bin/skip-tracker skip-tracker /usr/bin/python3-skip-tracker 200
 fi
 
diff --git a/debian/rules b/debian/rules
index 03df0a7..1229c3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,11 @@ override_dh_install:
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/python-tempest-lib; \
 	done
-	mv $(CURDIR)/debian/python-tempest-lib/usr/bin/subunit-trace $(CURDIR)/debian/python-tempest-lib/usr/bin/python2-subunit-trace
-	mv $(CURDIR)/debian/python-tempest-lib/usr/bin/skip-tracker $(CURDIR)/debian/python-tempest-lib/usr/bin/python2-skip-tracker
 	set -e ; for pyvers in $(PYTHON3S); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/python3-tempest-lib; \
 	done
-	mv $(CURDIR)/debian/python3-tempest-lib/usr/bin/subunit-trace $(CURDIR)/debian/python3-tempest-lib/usr/bin/python3-subunit-trace
+	mv $(CURDIR)/debian/python-tempest-lib/usr/bin/skip-tracker $(CURDIR)/debian/python-tempest-lib/usr/bin/python2-skip-tracker
 	mv $(CURDIR)/debian/python3-tempest-lib/usr/bin/skip-tracker $(CURDIR)/debian/python3-tempest-lib/usr/bin/python3-skip-tracker
 	rm -rf $(CURDIR)/debian/python*-tempest-lib/usr/lib/python*/dist-packages/*.pth