diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index a2c4db74..355d426a 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -903,7 +903,9 @@ TEST_P(OEMCryptoLicenseTest, EntitledKeySessionMultipleKeySessionsAPI17) {
       session_.session_id(), &key_session_id_2);
   // For DRM, but not for CAS, we allow there to be only a single entitled
   // session.
-  if (status == OEMCrypto_ERROR_TOO_MANY_SESSIONS) {
+  if (!global_features.supports_cas &&
+      (key_session_id_2 == key_session_id_1 ||
+       status == OEMCrypto_ERROR_TOO_MANY_SESSIONS)) {
     GTEST_SKIP()
         << "Skipping test because multiple entitled sessions not supported.";
   }