diff --git a/libwvdrmengine/oemcrypto/test/oec_session_util.cpp b/libwvdrmengine/oemcrypto/test/oec_session_util.cpp
index 243c7984..88c67879 100644
--- a/libwvdrmengine/oemcrypto/test/oec_session_util.cpp
+++ b/libwvdrmengine/oemcrypto/test/oec_session_util.cpp
@@ -70,9 +70,6 @@ void GenerateSimpleSampleDescription(
     const std::vector<uint8_t>& in, std::vector<uint8_t>& out,
     OEMCrypto_SampleDescription* sample,
     OEMCrypto_SubSampleDescription* subsample) {
-  ASSERT_NE(sample, nullptr);
-  ASSERT_NE(subsample, nullptr);
-
   // Generate test data
   EXPECT_EQ(GetRandBytes(&sample->iv[0], KEY_IV_SIZE), 1);
 
@@ -1338,9 +1335,8 @@ void Session::TestDecryptCTR(bool select_key_first,
   OEMCrypto_SampleDescription sample_description;
   OEMCrypto_SubSampleDescription subsample_description;
 
-  ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription(
-      encrypted_data, output_buffer, &sample_description,
-      &subsample_description));
+  GenerateSimpleSampleDescription(encrypted_data, output_buffer,
+                                  &sample_description, &subsample_description);
 
   // Generate test data
   EXPECT_EQ(GetRandBytes(unencrypted_data.data(), unencrypted_data.size()), 1);
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 07d2a1e7..8612bdae 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -2516,8 +2516,8 @@ TEST_P(OEMCryptoLicenseTest, SelectKeyNotThereAPI16) {
     OEMCrypto_SampleDescription sample_description;
     OEMCrypto_SubSampleDescription subsample_description;
 
-    ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription(
-        in_buffer, out_buffer, &sample_description, &subsample_description));
+    GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
+                                    &subsample_description);
 
     // Generate test data
     for (size_t i = 0; i < in_buffer.size(); i++) in_buffer[i] = i % 256;
@@ -2551,8 +2551,8 @@ TEST_P(OEMCryptoLicenseTest, RejectCensAPI16) {
   OEMCrypto_SampleDescription sample_description;
   OEMCrypto_SubSampleDescription subsample_description;
 
-  ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription(
-      in_buffer, out_buffer, &sample_description, &subsample_description));
+  GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
+                                  &subsample_description);
 
   // Create a non-zero pattern to indicate this is 'cens'
   OEMCrypto_CENCEncryptPatternDesc pattern = {1, 9};
@@ -2582,8 +2582,8 @@ TEST_P(OEMCryptoLicenseTest, RejectCbc1API16) {
   OEMCrypto_SampleDescription sample_description;
   OEMCrypto_SubSampleDescription subsample_description;
 
-  ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription(
-      in_buffer, out_buffer, &sample_description, &subsample_description));
+  GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
+                                  &subsample_description);
 
   // Create a zero pattern to indicate this is 'cbc1'
   OEMCrypto_CENCEncryptPatternDesc pattern = {0, 0};
@@ -2612,8 +2612,8 @@ TEST_P(OEMCryptoLicenseTest, RejectCbcsWithBlockOffset) {
   OEMCrypto_SampleDescription sample_description;
   OEMCrypto_SubSampleDescription subsample_description;
 
-  ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription(
-      in_buffer, out_buffer, &sample_description, &subsample_description));
+  GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
+                                  &subsample_description);
   subsample_description.block_offset = 5;  // Any value 1-15 will do.
 
   // Create a non-zero pattern to indicate this is 'cbcs'.
@@ -2643,8 +2643,8 @@ TEST_P(OEMCryptoLicenseTest, RejectOversizedBlockOffset) {
   OEMCrypto_SampleDescription sample_description;
   OEMCrypto_SubSampleDescription subsample_description;
 
-  ASSERT_NO_FATAL_FAILURE(GenerateSimpleSampleDescription(
-      in_buffer, out_buffer, &sample_description, &subsample_description));
+  GenerateSimpleSampleDescription(in_buffer, out_buffer, &sample_description,
+                                  &subsample_description);
   subsample_description.block_offset = 0xFF;  // Anything 16+
 
   // Create a zero pattern to indicate this is 'cenc'.