diff --git a/build/build.xml b/build/build.xml
index 3d4884883..4684d6bdd 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -204,6 +204,14 @@
     </target>
 
 
+    <!-- test -->
+    <!-- ======================================================================================= -->
+    <target name="func-test" depends="compile, jar-test" unless="no.test">
+        <antcall target="test.messenger"/>
+        <antcall target="test"/>
+    </target>
+
+
     <!-- test -->
     <!-- ======================================================================================= -->
     <target name="test" depends="compile, jar-test" unless="no.test">
diff --git a/test/org/jivesoftware/smack/RosterTest.java b/test/org/jivesoftware/smack/RosterTest.java
index cf2eb0eee..edc5d5f51 100644
--- a/test/org/jivesoftware/smack/RosterTest.java
+++ b/test/org/jivesoftware/smack/RosterTest.java
@@ -531,6 +531,13 @@ public class RosterTest extends SmackTestCase {
                 fail(e.getMessage());
             }
         }
+
+        try  {
+            Thread.sleep(1500);
+        }
+        catch (InterruptedException e) {
+            fail(e.getMessage());
+        }
         // Wait up to 2 seconds to receive roster removal notifications
         long initial = System.currentTimeMillis();
         while (System.currentTimeMillis() - initial < 2000 &&
@@ -597,7 +604,7 @@ public class RosterTest extends SmackTestCase {
         try  {
             Thread.sleep(500);
         }
-        catch (Exception e) {
+        catch (InterruptedException e) {
             fail(e.getMessage());
         }