diff -Nru telephony-service-0.1+16.04.20160331.3/debian/changelog telephony-service-0.1+16.04.20160331.4/debian/changelog
--- telephony-service-0.1+16.04.20160331.3/debian/changelog	2016-03-31 22:19:40.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/debian/changelog	2016-03-31 22:19:40.000000000 +0000
@@ -1,10 +1,10 @@
-telephony-service (0.1+16.04.20160331.3-0ubuntu1) xenial; urgency=medium
+telephony-service (0.1+16.04.20160331.4-0ubuntu1) xenial; urgency=medium
 
   * Do not change power mode on incoming MMS'. This is done by unity
     now. (LP: #1562923)
   * Fix duplicate tasks launched during tests
 
- -- Tiago Salem Herrmann <tiago.herrmann@canonical.com>  Thu, 31 Mar 2016 21:54:57 +0000
+ -- Tiago Salem Herrmann <tiago.herrmann@canonical.com>  Thu, 31 Mar 2016 22:17:43 +0000
 
 telephony-service (0.1+16.04.20160321.2-0ubuntu1) xenial; urgency=medium
 
diff -Nru telephony-service-0.1+16.04.20160331.3/tests/handler/HandlerTest.cpp telephony-service-0.1+16.04.20160331.4/tests/handler/HandlerTest.cpp
--- telephony-service-0.1+16.04.20160331.3/tests/handler/HandlerTest.cpp	2016-03-31 21:54:53.000000000 +0000
+++ telephony-service-0.1+16.04.20160331.4/tests/handler/HandlerTest.cpp	2016-03-31 22:17:38.000000000 +0000
@@ -152,7 +152,7 @@
 
     QSignalSpy callStateSpy(mMockController, SIGNAL(CallStateChanged(QString,QString,QString)));
 
-    QTest::qWait(1000);
+    TRY_VERIFY(HandlerController::instance()->hasCalls());
     // set the call on hold
     HandlerController::instance()->setHold(objectPath, true);
     TRY_COMPARE(callStateSpy.count(), 1);
@@ -413,6 +413,7 @@
 
     // then acknowledge the messages that arrived in the second channel and make sure handler
     // does the right thing
+    QTest::qWait(1000);
     QSignalSpy messageReadSpy(mMockController, SIGNAL(MessageRead(QString)));
     ChatManager::instance()->acknowledgeAllMessages(properties["Recipients"].toStringList(), mTpAccount->uniqueIdentifier());