diff --git a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
index 13764cc6..334b6fc9 100644
--- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
+++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
@@ -1308,10 +1308,25 @@ TEST_P(WvCdmStreamingNoPstTest, UsageTest) {
   QueryKeyStatus(true, true, &license_duration_remaining,
                  &playback_duration_remaining);
 
-  EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
-              expected_seconds_since_license_received, kClockTolerance);
-  EXPECT_NEAR(initial_playback_duration_remaining - playback_duration_remaining,
-              expected_seconds_since_initial_playback, kClockTolerance);
+  if (initial_license_duration_remaining == kUnlimitedDurationValue) {
+    EXPECT_EQ(license_duration_remaining, kUnlimitedDurationValue);
+  } else {
+    EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
+              expected_seconds_since_license_received, kClockTolerance)
+        << "initial_license_duration_remaining = "
+        << initial_license_duration_remaining
+        << ", license_duration_remaining = " << license_duration_remaining;
+  }
+
+  if (initial_playback_duration_remaining == kUnlimitedDurationValue) {
+    EXPECT_EQ(playback_duration_remaining, kUnlimitedDurationValue);
+  } else {
+    EXPECT_NEAR(initial_playback_duration_remaining - playback_duration_remaining,
+              expected_seconds_since_initial_playback, kClockTolerance)
+        << "initial_playback_duration_remaining = "
+        << initial_playback_duration_remaining
+        << ", playback_duration_remaining = " << playback_duration_remaining;
+  }
 
   decryptor_->CloseSession(session_id_);
 }
@@ -1375,10 +1390,25 @@ TEST_P(WvCdmStreamingPstTest, UsageTest) {
   QueryKeyStatus(true, false, &license_duration_remaining,
                  &playback_duration_remaining);
 
-  EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
-              expected_seconds_since_license_received, kClockTolerance);
-  EXPECT_NEAR(initial_playback_duration_remaining - playback_duration_remaining,
-              expected_seconds_since_initial_playback, kClockTolerance);
+  if (initial_license_duration_remaining == kUnlimitedDurationValue) {
+    EXPECT_EQ(license_duration_remaining, kUnlimitedDurationValue);
+  } else {
+    EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
+              expected_seconds_since_license_received, kClockTolerance)
+        << "initial_license_duration_remaining = "
+        << initial_license_duration_remaining
+        << ", license_duration_remaining = " << license_duration_remaining;
+  }
+
+  if (initial_playback_duration_remaining == kUnlimitedDurationValue) {
+    EXPECT_EQ(playback_duration_remaining, kUnlimitedDurationValue);
+  } else {
+    EXPECT_NEAR(initial_playback_duration_remaining - playback_duration_remaining,
+              expected_seconds_since_initial_playback, kClockTolerance)
+        << "initial_playback_duration_remaining = "
+        << initial_playback_duration_remaining
+        << ", playback_duration_remaining = " << playback_duration_remaining;
+  }
 
   decryptor_->CloseSession(session_id_);
 }
@@ -1556,11 +1586,29 @@ TEST_P(WvCdmOfflineUsageReportTest, UsageTest) {
     QueryKeyStatus(false, true, &license_duration_remaining,
                    &playback_duration_remaining);
 
-    EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
-                expected_seconds_since_license_received, kClockTolerance);
-    EXPECT_NEAR(
-        initial_playback_duration_remaining - playback_duration_remaining,
-        expected_seconds_since_initial_playback, kClockTolerance);
+    if (initial_license_duration_remaining == kUnlimitedDurationValue) {
+      EXPECT_EQ(license_duration_remaining, kUnlimitedDurationValue)
+          << "i = " << i;
+    } else {
+      EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
+                expected_seconds_since_license_received, kClockTolerance)
+          << "initial_license_duration_remaining = "
+          << initial_license_duration_remaining
+          << ", license_duration_remaining = " << license_duration_remaining
+          << ", i = " << i;
+    }
+
+    if (initial_playback_duration_remaining == kUnlimitedDurationValue) {
+      EXPECT_EQ(playback_duration_remaining, kUnlimitedDurationValue)
+          << "i = " << i;
+    } else {
+      EXPECT_NEAR(initial_playback_duration_remaining - playback_duration_remaining,
+                expected_seconds_since_initial_playback, kClockTolerance)
+          << "initial_playback_duration_remaining = "
+          << initial_playback_duration_remaining
+          << ", playback_duration_remaining = " << playback_duration_remaining
+          << ", i = " << i;
+    }
 
     // Decrypt data
     SubSampleInfo* data = &kEncryptedOfflineClip2SubSample;
@@ -1600,10 +1648,25 @@ TEST_P(WvCdmOfflineUsageReportTest, UsageTest) {
   QueryKeyStatus(false, true, &license_duration_remaining,
                  &playback_duration_remaining);
 
-  EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
-              expected_seconds_since_license_received, kClockTolerance);
-  EXPECT_NEAR(initial_playback_duration_remaining - playback_duration_remaining,
-              expected_seconds_since_initial_playback, kClockTolerance);
+  if (initial_license_duration_remaining == kUnlimitedDurationValue) {
+    EXPECT_EQ(license_duration_remaining, kUnlimitedDurationValue);
+  } else {
+    EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
+              expected_seconds_since_license_received, kClockTolerance)
+        << "initial_license_duration_remaining = "
+        << initial_license_duration_remaining
+        << ", license_duration_remaining = " << license_duration_remaining;
+  }
+
+  if (initial_playback_duration_remaining == kUnlimitedDurationValue) {
+    EXPECT_EQ(playback_duration_remaining, kUnlimitedDurationValue);
+  } else {
+    EXPECT_NEAR(initial_playback_duration_remaining - playback_duration_remaining,
+              expected_seconds_since_initial_playback, kClockTolerance)
+        << "initial_playback_duration_remaining = "
+        << initial_playback_duration_remaining
+        << ", playback_duration_remaining = " << playback_duration_remaining;
+  }
 
   decryptor_->CloseSession(session_id_);