diff -Nru python-rjsmin-1.0.12+dfsg1/debian/changelog python-rjsmin-1.0.12+dfsg1/debian/changelog
--- python-rjsmin-1.0.12+dfsg1/debian/changelog	2016-01-18 20:43:37.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/changelog	2016-03-09 15:54:36.000000000 +0000
@@ -1,3 +1,13 @@
+python-rjsmin (1.0.12+dfsg1-2ubuntu1) xenial; urgency=medium
+
+  * Enable benchmark tests for some level of unit testing:
+    - d/rules: Execute benchmarks for all python versions against a
+      selection of js files.
+    - d/p/skip-jsmin-bench.patch: Disable jsmin benchmark as excluded
+      from source.
+
+ -- James Page <james.page@ubuntu.com>  Wed, 09 Mar 2016 15:54:27 +0000
+
 python-rjsmin (1.0.12+dfsg1-2build1) xenial; urgency=medium
 
   * No-change rebuild to drop python3.4 support.
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/control python-rjsmin-1.0.12+dfsg1/debian/control
--- python-rjsmin-1.0.12+dfsg1/debian/control	2015-12-28 09:11:38.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/control	2016-03-09 12:17:37.000000000 +0000
@@ -1,7 +1,8 @@
 Source: python-rjsmin
 Section: python
 Priority: optional
-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
@@ -10,6 +11,7 @@
                python-setuptools,
                python3-all-dev,
                python3-setuptools,
+               python3-chardet,
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-rjsmin.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-rjsmin.git
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/patches/series python-rjsmin-1.0.12+dfsg1/debian/patches/series
--- python-rjsmin-1.0.12+dfsg1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/patches/series	2016-03-09 11:27:49.000000000 +0000
@@ -0,0 +1 @@
+skip-jsmin-bench.patch
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/patches/skip-jsmin-bench.patch python-rjsmin-1.0.12+dfsg1/debian/patches/skip-jsmin-bench.patch
--- python-rjsmin-1.0.12+dfsg1/debian/patches/skip-jsmin-bench.patch	1970-01-01 00:00:00.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/patches/skip-jsmin-bench.patch	2016-03-09 15:54:25.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Skip jsmin tests as dropped from source
+Author: James Page <james.page@ubuntu.com>
+Forwared: not-needed
+
+--- a/bench/main.py
++++ b/bench/main.py
+@@ -46,7 +46,6 @@ import time as _time
+ 
+ import_notes = []
+ class jsmins(object):
+-    from bench import jsmin as p_01_simple_port
+     if _sys.version_info >= (2, 4):
+         from bench import jsmin_2_0_9 as p_02_jsmin_2_0_9
+     else:
diff -Nru python-rjsmin-1.0.12+dfsg1/debian/rules python-rjsmin-1.0.12+dfsg1/debian/rules
--- python-rjsmin-1.0.12+dfsg1/debian/rules	2015-12-28 09:11:38.000000000 +0000
+++ python-rjsmin-1.0.12+dfsg1/debian/rules	2016-03-09 15:54:47.000000000 +0000
@@ -2,6 +2,8 @@
 
 PYTHONS:=$(shell pyversions -vr)
 PYTHON3S:=$(shell py3versions -vr)
+ARCH:=$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
+OS:=$(shell dpkg-architecture -qDEB_TARGET_ARCH_OS)
 
 UPSTREAM_GIT = git://github.com/ndparker/rjsmin.git
 include /usr/share/openstack-pkg-tools/pkgos.make
@@ -9,6 +11,12 @@
 %:
 	dh $@ --buildsystem=python_distutils --with python2,python3
 
+
+override_dh_auto_build:
+	set -e ; for pyvers in $(PYTHONS) $(PYTHON3S); do \
+		python$$pyvers setup.py build --force; \
+	done
+
 override_dh_auto_install:
 	set -e ; for pyvers in $(PYTHONS); do \
 		python$$pyvers setup.py install --install-layout=deb \
@@ -21,12 +29,15 @@
 	rm -rf $(CURDIR)/debian/python*/usr/lib/python*/dist-packages/*.pth
 	rm -rf $(CURDIR)/debian/python*/usr/share/doc/rjsmin*
 
-#override_dh_auto_test:
-#ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-#	set -e ; for pyvers in $(PYTHONS) $(PYTHON3S); do \
-#		python$$pyvers setup.py test ; \
-#	done
-#endif
+override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	env
+	set -e ; for pyvers in $(PYTHONS) $(PYTHON3S); do \
+		PYTHONPATH=$(CURDIR):$(CURDIR)/build/lib.$(OS)-$(ARCH)-$$pyvers python$$pyvers \
+			bench/main.py bench/bootstrap.js  bench/DateTimeShortcuts.js  bench/jquery-1.7.1.js \
+						  bench/knockout-2.0.0.js  bench/markermanager.js; \
+	done
+endif
 
 override_dh_clean:
 	dh_clean -O--buildsystem=python_distutils