diff --git a/test/firmware_handler_unittest.cpp b/test/firmware_handler_unittest.cpp
index e1e3a78..e2ef7f4 100644
--- a/test/firmware_handler_unittest.cpp
+++ b/test/firmware_handler_unittest.cpp
@@ -11,6 +11,10 @@
 
 namespace ipmi_flash
 {
+namespace
+{
+
+using ::testing::UnorderedElementsAreArray;
 
 TEST(FirmwareHandlerTest, CreateEmptyListVerifyFails)
 {
@@ -56,9 +60,9 @@
     handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
         blobs, data, CreateVerifyMock(), CreateUpdateMock());
     auto result = handler->getBlobIds();
-    EXPECT_EQ(3, result.size());
-    EXPECT_EQ(3, std::count(result.begin(), result.end(), "asdf") +
-                     std::count(result.begin(), result.end(), hashBlobId) +
-                     std::count(result.begin(), result.end(), verifyBlobId));
+    std::vector<std::string> expectedBlobs = {"asdf", hashBlobId};
+    EXPECT_THAT(result, UnorderedElementsAreArray(expectedBlobs));
 }
+
+} // namespace
 } // namespace ipmi_flash