diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 05bc48a1..626fe2d5 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -443,6 +443,9 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
  */
 TEST_P(OEMCryptoEntitlementLicenseTest,
        LoadEntitlementKeysOemcryptoSessionAPI17) {
+  if (!global_features.supports_cas) {
+    GTEST_SKIP() << "OEMCrypto does not support CAS";
+  }
   LoadEntitlementLicense();
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
@@ -724,6 +727,9 @@ TEST_P(OEMCryptoLicenseTest, SelectKeyEntitledKeyNotThereAPI17) {
  * id.
  */
 TEST_P(OEMCryptoLicenseTest, SelectKeyEntitlementKeyAPI17) {
+  if (!global_features.supports_cas) {
+    GTEST_SKIP() << "OEMCrypto does not support CAS";
+  }
   license_messages_.set_license_type(OEMCrypto_EntitlementLicense);
   ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest());
   ASSERT_NO_FATAL_FAILURE(license_messages_.CreateDefaultResponse());
@@ -799,6 +805,9 @@ TEST_P(OEMCryptoLicenseTest,
 // This verifies that multiple entitled key sessions can be created. They can
 // load and select keys independently.
 TEST_P(OEMCryptoLicenseTest, EntitledKeySessionMultipleKeySessionsAPI17) {
+  if (!global_features.supports_cas) {
+    GTEST_SKIP() << "OEMCrypto does not support CAS";
+  }
   license_messages_.set_license_type(OEMCrypto_EntitlementLicense);
   ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest());
   ASSERT_NO_FATAL_FAILURE(license_messages_.CreateDefaultResponse());
@@ -826,9 +835,7 @@ 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 (!global_features.supports_cas &&
-      (key_session_id_2 == key_session_id_1 ||
-       status == OEMCrypto_ERROR_TOO_MANY_SESSIONS)) {
+  if (status == OEMCrypto_ERROR_TOO_MANY_SESSIONS) {
     GTEST_SKIP()
         << "Skipping test because multiple entitled sessions not supported.";
   }