diff --git a/debian/ant.properties b/debian/ant.properties
index 6976ff6..31740e3 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,6 +1,11 @@
 project.name=libslf4j-java
 class.dir=classes
 source.dir=src/main/java
+test.dir=test
+test.source.dir=src/test/java
+test.class.dir=test/classes
+test.res.dir=test/results
+test.resource.dir=src/test/resources
 
 jcl-over-slf4j.dir=jcl-over-slf4j
 jul-to-slf4j.dir=jul-to-slf4j
diff --git a/debian/build.xml b/debian/build.xml
index 569dc48..f5a796c 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -15,6 +15,17 @@
     <delete dir="${slf4j-migrator.dir}/${class.dir}" quiet="true"/>
 <!--    <delete dir="${slf4j-ext.dir}/${class.dir}" quiet="true"/> -->
 
+    <delete dir="${jcl-over-slf4j.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${jul-to-slf4j.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${log4j-over-slf4j.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${slf4j-api.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${slf4j-jcl.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${slf4j-jdk14.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${slf4j-log4j12.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${slf4j-nop.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${slf4j-simple.dir}/${test.dir}" quiet="true"/>
+    <delete dir="${slf4j-migrator.dir}/${test.dir}" quiet="true"/>
+
     <delete file="${jcl-over-slf4j.jar}" quiet="true"/>
     <delete file="${jul-to-slf4j.jar}" quiet="true"/>
     <delete file="${log4j-over-slf4j.jar}" quiet="true"/>
@@ -141,4 +152,80 @@
 -->
   </target>
 
+  <target name="test-compile">
+    <mkdir dir="${slf4j-api.dir}/${test.class.dir}"/>
+    <javac srcdir="${slf4j-api.dir}/${test.source.dir}" destdir="${slf4j-api.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}"/>
+    <jar jarfile="${slf4j-api-test.jar}">
+      <fileset dir="${slf4j-api.dir}/${test.class.dir}">
+          <include name="**"/>
+      </fileset>
+    </jar>
+    <mkdir dir="${slf4j-jcl.dir}/${test.class.dir}"/>
+    <javac srcdir="${slf4j-jcl.dir}/${test.source.dir}" destdir="${slf4j-jcl.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/>
+    <mkdir dir="${slf4j-jdk14.dir}/${test.class.dir}"/>
+    <javac srcdir="${slf4j-jdk14.dir}/${test.source.dir}" destdir="${slf4j-jdk14.dir}/${test.class.dir}"
+      debug="true" source="1.4" target="1.4" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}:${slf4j-jdk14.jar}"/>
+    <mkdir dir="${slf4j-log4j12.dir}/${test.class.dir}"/>
+    <javac srcdir="${slf4j-log4j12.dir}/${test.source.dir}" destdir="${slf4j-log4j12.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/>
+    <mkdir dir="${slf4j-nop.dir}/${test.class.dir}"/>
+    <javac srcdir="${slf4j-nop.dir}/${test.source.dir}" destdir="${slf4j-nop.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/>
+    <mkdir dir="${slf4j-simple.dir}/${test.class.dir}"/>
+    <javac srcdir="${slf4j-simple.dir}/${test.source.dir}" destdir="${slf4j-simple.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-api-test.jar}"/>
+    <mkdir dir="${slf4j-migrator.dir}/${test.class.dir}"/>
+    <javac srcdir="${slf4j-migrator.dir}/${test.source.dir}" destdir="${slf4j-migrator.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-migrator.jar}"/>
+    <mkdir dir="${jcl-over-slf4j.dir}/${test.class.dir}"/>
+    <javac srcdir="${jcl-over-slf4j.dir}/${test.source.dir}" destdir="${jcl-over-slf4j.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-jdk14.jar}:${jcl-over-slf4j.jar}"/>
+    <mkdir dir="${jul-to-slf4j.dir}/${test.class.dir}"/>
+    <javac srcdir="${jul-to-slf4j.dir}/${test.source.dir}" destdir="${jul-to-slf4j.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-log4j12.jar}:${jul-to-slf4j.jar}"/>
+    <mkdir dir="${log4j-over-slf4j.dir}/${test.class.dir}"/>
+    <javac srcdir="${log4j-over-slf4j.dir}/${test.source.dir}" destdir="${log4j-over-slf4j.dir}/${test.class.dir}"
+      debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:${slf4j-jdk14.jar}:${log4j-over-slf4j.jar}"/>
+  </target>
+
+  <macrodef name="test">
+    <attribute name="path"/>
+    <attribute name="component"/>
+    <sequential>
+      <mkdir dir="@{component}/${test.res.dir}"/>
+      <junit printsummary="yes" haltonfailure="yes">
+        <classpath>
+          <pathelement path="@{path}"/>
+          <pathelement location="@{component}/${test.class.dir}"/>
+          <pathelement location="@{component}/${test.resource.dir}"/>
+          <pathelement location="${slf4j-api.jar}"/>
+        </classpath>
+        <formatter type="plain"/>
+        <batchtest todir="@{component}/${test.res.dir}">
+          <fileset dir="@{component}/${test.source.dir}">
+            <include name="**/*TestCase.java"/>
+            <include name="**/*Test.java"/>
+            <exclude name="**/*$*"/>
+            <exclude name="**/Abstract*"/>
+          </fileset>
+        </batchtest>
+       </junit>
+    </sequential>
+  </macrodef>
+
+  <target name="test" depends="test-compile">
+    <test component="${slf4j-api.dir}" path="${slf4j-api.jar}"/>
+    <test component="${slf4j-jcl.dir}" path="${slf4j-api-test.jar}"/>
+    <test component="${slf4j-jdk14.dir}" path="${slf4j-api-test.jar}:${slf4j-jdk14.jar}"/>
+    <test component="${slf4j-log4j12.dir}" path="${slf4j-api-test.jar}:${slf4j-log4j12.jar}"/>
+    <test component="${slf4j-nop.dir}" path="${slf4j-api-test.jar}:${slf4j-nop.jar}"/>
+    <test component="${slf4j-simple.dir}" path="${slf4j-api-test.jar}:${slf4j-simple.jar}"/>
+    <test component="${slf4j-migrator.dir}" path="${slf4j-migrator.jar}"/>
+    <test component="${jcl-over-slf4j.dir}" path="${jcl-over-slf4j.jar}:${slf4j-jdk14.jar}"/>
+    <test component="${jul-to-slf4j.dir}" path="${jul-to-slf4j.jar}:${slf4j-log4j12.jar}"/>
+    <test component="${log4j-over-slf4j.dir}" path="${log4j-over-slf4j.jar}:${slf4j-jdk14.jar}"/>
+  </target>
+
 </project>
diff --git a/debian/changelog b/debian/changelog
index 3815b46..d709553 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libslf4j-java (1.6.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Merge changes from Ubuntu, thanks to James Page (Closes: #646092) :
+    + Enable test suite:
+      - d/ant.properties, d/build.xml: Define new targets to compile and 
+        execute test suites for all jar files.
+      - d/control: Add ant-optional and junit to B-D's.
+      - d/rules: Define DEB_ANT_CHECK_TARGET to execute test suite and add
+        ant-junit and junit to DEB_JARS.
+    + d/control: Remove surplus dependencies - libjavassist-java, 
+      libcommons-lang-java
+
+ -- Damien Raude-Morvan <drazzib@debian.org>  Tue, 01 Nov 2011 23:48:41 +0100
+
 libslf4j-java (1.6.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index e5ba7fb..6b8b7e7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@
 Uploaders: Varun Hiremath <varun@debian.org>,
            Damien Raude-Morvan <drazzib@debian.org>
 Build-Depends: ant,
+               ant-optional,
                cdbs,
                debhelper (>= 7),
                default-jdk,
-               libcommons-lang-java,
+               junit,
                libcommons-logging-java,
-               libjavassist-java,
                liblog4j1.2-java,
                maven-repo-helper
 Standards-Version: 3.9.2
@@ -21,7 +21,7 @@
 Package: libslf4j-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libcommons-logging-java, libjavassist-java, liblog4j1.2-java
+Suggests: libcommons-logging-java, liblog4j1.2-java
 Description: Simple Logging Facade for Java
  The Simple Logging Facade for Java (or SLF4J) is intended to serve as
  a simple facade for various logging APIs allowing to the end-user to
diff --git a/debian/rules b/debian/rules
index 52423f6..bedb021 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,9 @@
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_CHECK_TARGET := test
 DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_JARS             := commons-logging log4j-1.2
+DEB_JARS             := commons-logging log4j-1.2 ant-junit junit
 MODULES              := jcl-over-slf4j jul-to-slf4j log4j-over-slf4j slf4j-api \
   slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-migrator slf4j-nop slf4j-simple