1 files changed, 10 insertions, 3 deletions
diff --git a/src/mongo/crypto/jwt_test.cpp b/src/mongo/crypto/jwt_test.cpp
index b43b929b08a..ae414ae17f0 100644
--- a/src/mongo/crypto/jwt_test.cpp
+++ b/src/mongo/crypto/jwt_test.cpp
@@ -53,13 +53,20 @@ TEST(JWKManager, parseJWKSetBasicFromSource) {
     BSONObj data = fromjson(str);
     JWKManager manager(source);
 
+    BSONObjBuilder bob;
+    manager.serialize(&bob);
+    ASSERT_BSONOBJ_EQ(bob.obj(), data);
+
+    const auto& initialKeys = manager.getInitialKeys();
     for (const auto& key : data["keys"_sd].Obj()) {
-        auto keyFromKid = uassertStatusOK(manager.getKey(key["kid"_sd].str()));
-        ASSERT_BSONOBJ_EQ(key.Obj(), keyFromKid);
+        auto initialKey = initialKeys.find(key["kid"_sd].str());
+        ASSERT(initialKey != initialKeys.end());
+        ASSERT_BSONOBJ_EQ(key.Obj(), initialKey->second);
     }
 
     for (const auto& key : data["keys"_sd].Obj()) {
-        ASSERT(manager.getValidator(key["kid"_sd].str()));
+        auto validator = uassertStatusOK(manager.getValidator(key["kid"_sd].str()));
+        ASSERT(validator);
     }
 }