diff --git a/services/tunnelbroker/test/CryptoToolsTest.cpp b/services/tunnelbroker/test/CryptoToolsTest.cpp
--- a/services/tunnelbroker/test/CryptoToolsTest.cpp
+++ b/services/tunnelbroker/test/CryptoToolsTest.cpp
@@ -10,7 +10,7 @@
 
 class CryptoToolsTest : public testing::Test {};
 
-TEST(CryptoToolsTest, TestOperationsOnRsaVerifyStringSuccess) {
+TEST(CryptoToolsTest, RsaVerifyStringIsTrueOnValidSignature) {
   const std::string publicKeyBase64 =
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGC8M8FdRSSEdfAufY/V5iP6cB"
       "crXdeZa19OjpbbNvq9qAT2FobnYrlNI8p3y/2LvJBxlR9VlvS0Nh4HLZLdmf8zOf"
@@ -27,7 +27,7 @@
       true);
 }
 
-TEST(CryptoToolsTest, TestOperationsOnRsaVerifyStringFail) {
+TEST(CryptoToolsTest, RsaVerifyStringIsFalseOnInvalidSignature) {
   const std::string publicKeyBase64 =
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGC8M8FdRSSEdfAufY/V5iP6cB"
       "crXdeZa19OjpbbNvq9qAT2FobnYrlNI8p3y/2LvJBxlR9VlvS0Nh4HLZLdmf8zOf"
diff --git a/services/tunnelbroker/test/DatabaseManagerTest.cpp b/services/tunnelbroker/test/DatabaseManagerTest.cpp
--- a/services/tunnelbroker/test/DatabaseManagerTest.cpp
+++ b/services/tunnelbroker/test/DatabaseManagerTest.cpp
@@ -100,7 +100,7 @@
       item.getMessageID());
 }
 
-TEST_F(DatabaseManagerTest, TestOperationsOnDeviceSessionItem) {
+TEST_F(DatabaseManagerTest, PutAndFoundDeviceSessionItemStaticDataIsSame) {
   const database::DeviceSessionItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
@@ -131,7 +131,7 @@
       item.getSessionID());
 }
 
-TEST_F(DatabaseManagerTest, TestOperationsOnDeviceSessionItemGenerated) {
+TEST_F(DatabaseManagerTest, PutAndFoundDeviceSessionItemGeneratedDataIsSame) {
   const database::DeviceSessionItem item(
       tools::generateUUID(),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
@@ -177,7 +177,7 @@
       item.getSessionID());
 }
 
-TEST_F(DatabaseManagerTest, TestOperationsOnSessionSignItem) {
+TEST_F(DatabaseManagerTest, PutAndFoundSessionSignItemStaticDataIsSame) {
   const database::SessionSignItem item(
       "bB3OSLdKlY60KPBpw6VoGKX7Lmw3SA07FmNhnqnclvVeaxXueAQ0dpQSpiQTtlGn",
       "mobile:"
@@ -196,7 +196,7 @@
       item.getDeviceID());
 }
 
-TEST_F(DatabaseManagerTest, TestOperationsOnSessionSignItemGenerated) {
+TEST_F(DatabaseManagerTest, PutAndFoundSessionSignItemGeneratedDataIsSame) {
   const database::SessionSignItem item(
       tools::generateRandomString(SIGNATURE_REQUEST_LENGTH),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH));