diff --git a/debian/changelog b/debian/changelog
index 192266a..f6c7516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-ceilometerclient (1.2.0-2) experimental; urgency=medium
+
+  * Add autopkgtests from Ubuntu.
+
+ -- James Page <james.page@ubuntu.com>  Wed, 08 Jul 2015 17:08:43 +0100
+
 python-ceilometerclient (1.2.0-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 2ccacd6..3ef8162 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-ceilometerclient.git;a=summary
 Vcs-Git: git://anonscm.debian.org/openstack/python-ceilometerclient.git
 Homepage: http://www.openstack.org
+XS-Testsuite: autopkgtest
 
 Package: python-ceilometerclient
 Architecture: all
diff --git a/debian/tests/client b/debian/tests/client
new file mode 100755
index 0000000..af94724
--- /dev/null
+++ b/debian/tests/client
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+HELP_CLIENTS=('ceilometer')
+for client in "${HELP_CLIENTS[@]}"; do
+    RET=$($client -h 2>&1 > /dev/null)
+
+    if [[ $RET ]]; then
+        echo "ERROR, ${client} is not running"
+    fi
+done
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..ae1c261
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: client
+Depends: python-ceilometerclient