diff --git a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
index 28614f20..788a7959 100644
--- a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
+++ b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
@@ -160,7 +160,6 @@ std::string DeviceFeatures::RestrictFilter(const std::string& initial_filter) {
       provisioning_method == OEMCrypto_BootCertificateChain)
                                       FilterOut(&filter, "OEMCryptoLoadsCert*");
   if (!generic_crypto)                FilterOut(&filter, "*GenericCrypto*");
-  if (!supports_cas)                  FilterOut(&filter, "*CasOnly*");
   if (derive_key_method == NO_METHOD) FilterOut(&filter, "*SessionTest*");
   if (!supports_rsa_3072)             FilterOut(&filter, "*RSAKey3072*");
   if (api_version < 17)               FilterOut(&filter, "*API17*");
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 8304fe2f..5dd260a4 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -294,6 +294,9 @@ TEST_P(OEMCryptoEntitlementLicenseTest, LoadEntitlementKeysAPI17) {
 }
 
 TEST_P(OEMCryptoEntitlementLicenseTest, CasOnlyLoadCasKeysAPI17) {
+  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(
@@ -344,6 +347,9 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
  */
 TEST_P(OEMCryptoEntitlementLicenseTest,
        CasOnlyLoadCasKeysNoEntitlementKeysAPI17) {
+  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());
@@ -380,6 +386,9 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
 
 TEST_P(OEMCryptoEntitlementLicenseTest,
        CasOnlyLoadCasKeysWrongEntitlementKeysAPI17) {
+  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(
@@ -414,6 +423,9 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
 
 TEST_P(OEMCryptoEntitlementLicenseTest,
        CasOnlyLoadCasKeysWrongEntitledKeySessionAPI17) {
+  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(
@@ -452,6 +464,9 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
 
 TEST_P(OEMCryptoEntitlementLicenseTest,
        CasOnlyLoadCasKeysOemcryptoSessionAPI17) {
+  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(
@@ -1425,6 +1440,9 @@ class OEMCryptoSessionTestLoadCasKeysWithHDCP : public OEMCryptoSessionTests,
 };
 
 TEST_P(OEMCryptoSessionTestLoadCasKeysWithHDCP, CasOnlyLoadCasKeysAPI17) {
+  if (!global_features.supports_cas) {
+    GTEST_SKIP() << "OEMCrypto does not support CAS";
+  }
   // Test parameterized by HDCP version.
   LoadCasKeysWithHDCP(static_cast<OEMCrypto_HDCP_Capability>(GetParam()));
 }