diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 06144d70..29614819 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -1865,7 +1865,7 @@ TEST_P(OEMCryptoRefreshTest, RefreshLargeBuffer) {
   LoadLicense();
   RenewalRoundTrip renewal_messages(&license_messages_);
   const size_t max_size = GetResourceValue(kLargeMessageSize);
-  license_messages_.set_message_size(max_size);
+  renewal_messages.set_message_size(max_size);
   MakeRenewalRequest(&renewal_messages);
   LoadRenewal(&renewal_messages, OEMCrypto_SUCCESS);
 }
@@ -4201,6 +4201,11 @@ class OEMCryptoGenericCryptoTest : public OEMCryptoRefreshTest {
     }
   }
 
+  void ResizeBuffer(size_t new_size) {
+    buffer_size_ = new_size;
+    InitializeClearBuffer();  // Re-initialize the clear buffer.
+  }
+
   void EncryptAndLoadKeys() {
     ASSERT_NO_FATAL_FAILURE(license_messages_.EncryptAndSignResponse());
     ASSERT_EQ(OEMCrypto_SUCCESS, license_messages_.LoadResponse());
@@ -4536,7 +4541,7 @@ TEST_P(OEMCryptoGenericCryptoTest, GenericKeyBadVerify) {
 
 // Test Generic_Encrypt with the maximum buffer size.
 TEST_P(OEMCryptoGenericCryptoTest, GenericKeyEncryptLargeBuffer) {
-  buffer_size_ = GetResourceValue(kMaxGenericBuffer);
+  ResizeBuffer(GetResourceValue(kMaxGenericBuffer));
   EncryptAndLoadKeys();
   unsigned int key_index = 0;
   vector<uint8_t> expected_encrypted;
@@ -4559,7 +4564,7 @@ TEST_P(OEMCryptoGenericCryptoTest, GenericKeyEncryptLargeBuffer) {
 // Test Generic_Decrypt with the maximum buffer size.
 TEST_P(OEMCryptoGenericCryptoTest, GenericKeyDecryptLargeBuffer) {
   // Some applications are known to pass in a block that is almost 400k.
-  buffer_size_ = GetResourceValue(kMaxGenericBuffer);
+  ResizeBuffer(GetResourceValue(kMaxGenericBuffer));
   EncryptAndLoadKeys();
   unsigned int key_index = 1;
   vector<uint8_t> encrypted;
@@ -4580,7 +4585,7 @@ TEST_P(OEMCryptoGenericCryptoTest, GenericKeyDecryptLargeBuffer) {
 
 // Test Generic_Sign with the maximum buffer size.
 TEST_P(OEMCryptoGenericCryptoTest, GenericKeySignLargeBuffer) {
-  buffer_size_ = GetResourceValue(kMaxGenericBuffer);
+  ResizeBuffer(GetResourceValue(kMaxGenericBuffer));
   EncryptAndLoadKeys();
   unsigned int key_index = 2;
   vector<uint8_t> expected_signature;
@@ -4608,7 +4613,7 @@ TEST_P(OEMCryptoGenericCryptoTest, GenericKeySignLargeBuffer) {
 
 // Test Generic_Verify with the maximum buffer size.
 TEST_P(OEMCryptoGenericCryptoTest, GenericKeyVerifyLargeBuffer) {
-  buffer_size_ = GetResourceValue(kMaxGenericBuffer);
+  ResizeBuffer(GetResourceValue(kMaxGenericBuffer));
   EncryptAndLoadKeys();
   unsigned int key_index = 3;
   vector<uint8_t> signature;