diff --git a/test/unitTest/account_archive/account_archive.cpp b/test/unitTest/account_archive/account_archive.cpp
index 216f264cbbd694567d4762a01e9f23bd9b01fc28..8c70d6c0d2b97eb7a356e4bade1b4366accb87de 100644
--- a/test/unitTest/account_archive/account_archive.cpp
+++ b/test/unitTest/account_archive/account_archive.cpp
@@ -70,7 +70,7 @@ public:
 
     std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>> confHandlers;
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
     bool aliceReady = false;
 
diff --git a/test/unitTest/account_factory/testAccount_factory.cpp b/test/unitTest/account_factory/testAccount_factory.cpp
index 2a9f6bb42f905e70898eb8e6a1474defdb7c72d0..30b27cec8b6c41cedbe22ea1b2093240fd4dbdea 100644
--- a/test/unitTest/account_factory/testAccount_factory.cpp
+++ b/test/unitTest/account_factory/testAccount_factory.cpp
@@ -68,7 +68,7 @@ private:
     size_t initialAccounts;
     std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>> confHandlers;
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 };
 
diff --git a/test/unitTest/call/conference.cpp b/test/unitTest/call/conference.cpp
index 994805bfffa27c5cf54b4ffa0a35c64017b440f2..19d7bd2d64495c4ce455ad34b6a8ec705b0bef71 100644
--- a/test/unitTest/call/conference.cpp
+++ b/test/unitTest/call/conference.cpp
@@ -152,7 +152,7 @@ private:
     CallData daviCall {};
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
     void registerSignalHandlers();
diff --git a/test/unitTest/call/recorder.cpp b/test/unitTest/call/recorder.cpp
index ce425e772e4ebbc93009044ab6740dc55e148fb7..7c5c4d02e9d3f86e875d7728f73642067853d2d2 100644
--- a/test/unitTest/call/recorder.cpp
+++ b/test/unitTest/call/recorder.cpp
@@ -84,7 +84,7 @@ public:
     CallData bobCall {};
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
     std::string videoPath = "file://" + std::filesystem::absolute("media/test_video_file.mp4").string();
diff --git a/test/unitTest/conversation/call.cpp b/test/unitTest/conversation/call.cpp
index 6ef0ee4ead8ff6c04ad1355aae47caa7f964eb9d..7a49806c3a167e346126d4f1867cd496cce08f6a 100644
--- a/test/unitTest/conversation/call.cpp
+++ b/test/unitTest/conversation/call.cpp
@@ -69,7 +69,7 @@ public:
     std::vector<std::map<std::string, std::string>> pInfos_ {};
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
 private:
diff --git a/test/unitTest/conversation/conversation.cpp b/test/unitTest/conversation/conversation.cpp
index c6a170ccd814aea8741231a0dad4e36e4c5997fa..69cf03cf1a6904eb0f6ae0b6b3cb45182f7e85ab 100644
--- a/test/unitTest/conversation/conversation.cpp
+++ b/test/unitTest/conversation/conversation.cpp
@@ -101,7 +101,7 @@ public:
     UserData carlaData;
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
     void connectSignals();
diff --git a/test/unitTest/conversation/conversationFetchSent.cpp b/test/unitTest/conversation/conversationFetchSent.cpp
index 8f83190c10ab5e6b7c766e913368cff2399edf09..e7c6eac6e568574d1557c60face54119a47590d4 100644
--- a/test/unitTest/conversation/conversationFetchSent.cpp
+++ b/test/unitTest/conversation/conversationFetchSent.cpp
@@ -76,7 +76,7 @@ public:
     UserData carlaData;
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
     void connectSignals();
diff --git a/test/unitTest/conversation/conversationMembersEvent.cpp b/test/unitTest/conversation/conversationMembersEvent.cpp
index f3737e377d1ef5a9cd8fc0eafc0f857b8d9e636d..0f5f008de024ab80c6c7cf4670763efd925743ba 100644
--- a/test/unitTest/conversation/conversationMembersEvent.cpp
+++ b/test/unitTest/conversation/conversationMembersEvent.cpp
@@ -118,7 +118,7 @@ public:
     std::string carlaId;
     UserData carlaData;
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
     void connectSignals();
diff --git a/test/unitTest/conversation/conversationRequest.cpp b/test/unitTest/conversation/conversationRequest.cpp
index 69a5af190c44bb549ff62033797a8659b7251bc7..c758992c1a7fd895376fac33adadda86d462a62b 100644
--- a/test/unitTest/conversation/conversationRequest.cpp
+++ b/test/unitTest/conversation/conversationRequest.cpp
@@ -105,7 +105,7 @@ public:
     UserData carlaData;
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
     void connectSignals();
@@ -718,9 +718,6 @@ ConversationRequestTest::testBanContactRestartAccount()
     auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
     auto bobUri = bobAccount->getUsername();
     auto aliceUri = aliceAccount->getUsername();
-    std::mutex mtx;
-    std::unique_lock lk {mtx};
-    std::condition_variable cv;
     std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>> confHandlers;
     bool conversationReady = false, requestReceived = false, memberMessageGenerated = false;
     std::string convId = "";
diff --git a/test/unitTest/conversation/typers.cpp b/test/unitTest/conversation/typers.cpp
index 7229a381d96f925e59f008adbf5a0b844ba2eb9c..82ee796db3418506d658b3938b65a93ace3e23f5 100644
--- a/test/unitTest/conversation/typers.cpp
+++ b/test/unitTest/conversation/typers.cpp
@@ -67,7 +67,7 @@ public:
     UserData bobData;
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
     void connectSignals();
diff --git a/test/unitTest/fileTransfer/fileTransfer.cpp b/test/unitTest/fileTransfer/fileTransfer.cpp
index ceeda2a71fead5b3bd558356dbd71420b60eb499..852b527111d3f1d62a2ab2199a3f97c5ea2e853b 100644
--- a/test/unitTest/fileTransfer/fileTransfer.cpp
+++ b/test/unitTest/fileTransfer/fileTransfer.cpp
@@ -85,7 +85,7 @@ public:
     std::filesystem::path recv2Path {std::filesystem::current_path() / "RECV2"};
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
     void connectSignals();
diff --git a/test/unitTest/media/test_media_player.cpp b/test/unitTest/media/test_media_player.cpp
index 8edcd64e183f9bec27a8423e7825f0352bc0fa15..9c9110492918ebab75dfd58df24f35d6c3f3c707 100644
--- a/test/unitTest/media/test_media_player.cpp
+++ b/test/unitTest/media/test_media_player.cpp
@@ -64,7 +64,7 @@ private:
     std::shared_ptr<MediaPlayer> mediaPlayer {};
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 };
 
diff --git a/test/unitTest/presence/presence.cpp b/test/unitTest/presence/presence.cpp
index f9a9cc7cdf6ead28dbae35d5dac9958b4d91a7d7..285646f45aef3be21563beba1759c1f6f2cb5bd3 100644
--- a/test/unitTest/presence/presence.cpp
+++ b/test/unitTest/presence/presence.cpp
@@ -61,7 +61,7 @@ public:
     UserData carlaData_;
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
 private:
diff --git a/test/unitTest/swarm/swarm_conversation.cpp b/test/unitTest/swarm/swarm_conversation.cpp
index 2085ac20af7ebf0f512dae7686d4ef3626f21914..0359306d48b0d81be4fb0ef640749c4a936199d6 100644
--- a/test/unitTest/swarm/swarm_conversation.cpp
+++ b/test/unitTest/swarm/swarm_conversation.cpp
@@ -67,7 +67,7 @@ public:
     std::vector<std::string> accountIds;
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
 
 private:
diff --git a/test/unitTest/syncHistory/syncHistory.cpp b/test/unitTest/syncHistory/syncHistory.cpp
index ecc5fc99239ae05844c1dda55c86f96b0e998042..410f8ddd0fe34498542bb1fd3e204fe69a7813ad 100644
--- a/test/unitTest/syncHistory/syncHistory.cpp
+++ b/test/unitTest/syncHistory/syncHistory.cpp
@@ -83,7 +83,7 @@ public:
     UserData alice2Data;
 
     std::mutex mtx;
-    std::unique_lock lk {mtx};
+    std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
     void connectSignals();