diff --git a/services/tunnelbroker/src/libcpp/test/DatabaseManagerTest.cpp b/services/tunnelbroker/src/libcpp/test/DatabaseManagerTest.cpp
--- a/services/tunnelbroker/src/libcpp/test/DatabaseManagerTest.cpp
+++ b/services/tunnelbroker/src/libcpp/test/DatabaseManagerTest.cpp
@@ -244,6 +244,34 @@
       item.getSessionID());
 }
 
+TEST_F(DatabaseManagerTest, FindDeviceSessionItemsByDeviceID) {
+  const std::string deviceID =
+      "mobile:02QNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm";
+  const std::string sessionID = "ac1c1aa2-bf09-11ec-9d64-0242ac120002";
+  const database::DeviceSessionItem item(
+      sessionID,
+      deviceID,
+      "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
+      "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
+      "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
+      "U3SK6SNKyR7anAXDVQIDAQAB",
+      "hbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3",
+      "MOBILE",
+      "ios:1.1.1",
+      "iOS 99.99.99");
+  EXPECT_EQ(
+      database::DatabaseManager::getInstance().isTableAvailable(
+          item.getTableName()),
+      true);
+  database::DatabaseManager::getInstance().putSessionItem(item);
+  std::vector<std::shared_ptr<database::DeviceSessionItem>> foundItems =
+      database::DatabaseManager::getInstance().findSessionItemsByDeviceID(
+          deviceID);
+  EXPECT_EQ(foundItems.size(), 1);
+  EXPECT_EQ(foundItems[0]->getSessionID(), sessionID);
+  database::DatabaseManager::getInstance().removeSessionItem(sessionID);
+}
+
 TEST_F(DatabaseManagerTest, UpdateNotifTokenInDeviceSessionItem) {
   const database::DeviceSessionItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",