diff --git a/services/tunnelbroker/test/AmqpManagerTest.cpp b/services/tunnelbroker/test/AmqpManagerTest.cpp
index 9b861264e..6fc0daf9e 100644
--- a/services/tunnelbroker/test/AmqpManagerTest.cpp
+++ b/services/tunnelbroker/test/AmqpManagerTest.cpp
@@ -1,74 +1,82 @@
 #include "AmqpManager.h"
 #include "ConfigManager.h"
 #include "Constants.h"
 #include "DeliveryBroker.h"
 #include "GlobalTools.h"
 #include "Tools.h"
 
 #include <gtest/gtest.h>
 
 #include <string>
 #include <thread>
 
 using namespace comm::network;
 
 class AmqpManagerTest : public testing::Test {
 protected:
   virtual void SetUp() {
     config::ConfigManager::getInstance().load();
     AmqpManager::getInstance().init();
   }
 };
 
 TEST_F(AmqpManagerTest, SentAndPopedMessagesAreSameOnStaticData) {
   const std::string messageID = "bc0c1aa2-bf09-11ec-9d64-0242ac120002";
   const std::string fromDeviceID =
       "web:JouLWf84zqRIsjBdHLOcHS9M4eSCz7VF84wT1uOD83u1qxDAqmqI4swmxNINjuhd";
   const std::string toDeviceID =
       "mobile:EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm";
   const std::string payload =
       "lYlNcO6RR4i9UW3G1DGjdJTRRGbqtPya2aj94ZRjIGZWoHwT5MB9ciAgnQf2VafYb9Tl"
       "8SZkX37tg4yZ9pOb4lqslY4g4h58OmWjumghVRvrPUZDalUuK8OLs1Qoengpu9wccxAk"
       "Bti2leDTNeiJDy36NnwS9aCIUc0ozsMvXfX1gWdBdmKbiRG1LvpNd6S7BNGG7Zly5zYj"
       "xz7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8G5"
       "RJ1NEDQq2q2FRfWjNHLhky92C2C7Nnfe4oVzSinfC1319uUkNLpSzI4MvEMi6g5Ukbl7"
       "iGhpnX7Hp4xpBL3h2IkvGviDRQ98UvW0ugwUuPxm1NOQpjLG5dPoqQ0jrMst0Bl5rgPw"
       "ajjNGsUWmp9r0ST0wRQXrQcY30PoSoqKSlCEgFMLzHWLrPQ86QFyCICismGSe7iBIqdD"
       "6d37StvXBzfJoZVU79UeOF2bFvb3DNoArEOe";
   const database::MessageItem messageItem{
       messageID, fromDeviceID, toDeviceID, payload, ""};
-  EXPECT_EQ(AmqpManager::getInstance().send(&messageItem), true);
+  // To properly test multi-thread delivery we should send in another thread
+  std::thread sendThread([&messageItem]() {
+    EXPECT_EQ(AmqpManager::getInstance().send(&messageItem), true);
+  });
+  sendThread.join();
   DeliveryBrokerMessage receivedMessage =
       DeliveryBroker::getInstance().pop(toDeviceID);
   EXPECT_EQ(messageID, receivedMessage.messageID);
   EXPECT_EQ(fromDeviceID, receivedMessage.fromDeviceID);
   EXPECT_EQ(payload, receivedMessage.payload);
   AmqpManager::getInstance().ack(receivedMessage.deliveryTag);
 }
 
 TEST_F(AmqpManagerTest, SentAndPopedMessagesAreSameOnGeneratedData) {
   const std::string messageID = tools::generateUUID();
   const std::string fromDeviceID =
       "web:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH);
   const std::string toDeviceID =
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH);
   const std::string payload = tools::generateRandomString(512);
   const database::MessageItem messageItem{
       messageID, fromDeviceID, toDeviceID, payload, ""};
-  EXPECT_EQ(AmqpManager::getInstance().send(&messageItem), true);
+  // To properly test multi-thread delivery we should send in another thread
+  std::thread sendThread([&messageItem]() {
+    EXPECT_EQ(AmqpManager::getInstance().send(&messageItem), true);
+  });
+  sendThread.join();
   DeliveryBrokerMessage receivedMessage =
       DeliveryBroker::getInstance().pop(toDeviceID);
   EXPECT_EQ(messageID, receivedMessage.messageID)
       << "Generated messageID \"" << messageID
       << "\" differs from what was got from amqp message "
       << receivedMessage.messageID;
   EXPECT_EQ(fromDeviceID, receivedMessage.fromDeviceID)
       << "Generated FromDeviceID \"" << fromDeviceID
       << "\" differs from what was got from amqp message "
       << receivedMessage.fromDeviceID;
   EXPECT_EQ(payload, receivedMessage.payload)
       << "Generated Payload \"" << payload
       << "\" differs from what was got from amqp message "
       << receivedMessage.payload;
   AmqpManager::getInstance().ack(receivedMessage.deliveryTag);
 }