diff --git a/libwvdrmengine/cdm/core/test/test_base.cpp b/libwvdrmengine/cdm/core/test/test_base.cpp
index 192d87ff..4d3365e6 100644
--- a/libwvdrmengine/cdm/core/test/test_base.cpp
+++ b/libwvdrmengine/cdm/core/test/test_base.cpp
@@ -677,7 +677,13 @@ bool WvCdmTestBase::Initialize(int argc, const char* const argv[],
   // Figure out which tests are appropriate for OEMCrypto, based on features
   // supported.
   wvoec::global_features.Initialize();
-  wvoec::global_features.set_cast_receiver(is_cast_receiver);
+  if (is_cast_receiver) {
+    // Turn it on if passed in on the command line. Do not turn these tests off
+    // automtically -- instead, we'll let the caller filter them out if they
+    // need to. These tests will normally only run if the device claims to
+    // support being a cast receiver.
+    wvoec::global_features.set_cast_receiver(is_cast_receiver);
+  }
   // If the user requests --no_filter, we don't change the filter, otherwise, we
   // filter out features that are not supported.
   if (filter_tests) {
diff --git a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
index ca471a85..5084cc30 100644
--- a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
+++ b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
@@ -122,7 +122,6 @@ void DeviceFeatures::Initialize() {
   switch (derive_key_method) {
     case NO_METHOD:
       printf("NO_METHOD: Cannot derive known session keys.\n");
-      // Note: cast_receiver left unchanged because set by user on command line.
       uses_keybox = false;
       loads_certificate = false;
       generic_crypto = false;
@@ -161,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 (!cast_receiver)                 FilterOut(&filter, "*CastReceiver*");
   if (!supports_cas)                  FilterOut(&filter, "*CasOnly*");
   if (derive_key_method == NO_METHOD) FilterOut(&filter, "*SessionTest*");
   if (provisioning_method != OEMCrypto_BootCertificateChain)
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_security_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_security_test.cpp
index 15be27f7..dc39198a 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_security_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_security_test.cpp
@@ -772,6 +772,7 @@ TEST_F(OEMCryptoLoadsCertificateAlternates,
     ASSERT_TRUE(key_loaded_);
   }
   if (key_loaded_) {
+    // If the key did load, then it should be processed correctly.
     Session s;
     ASSERT_NO_FATAL_FAILURE(s.open());
     ASSERT_NO_FATAL_FAILURE(s.LoadWrappedRsaDrmKey(wrapped_rsa_key_));
@@ -804,6 +805,7 @@ TEST_F(OEMCryptoLoadsCertificateAlternates,
     ASSERT_TRUE(key_loaded_);
   }
   if (key_loaded_) {
+    // If the key did load, then it should be processed correctly.
     Session s;
     ASSERT_NO_FATAL_FAILURE(s.open());
     ASSERT_NO_FATAL_FAILURE(s.LoadWrappedRsaDrmKey(wrapped_rsa_key_));
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index c2a7a9f7..c8604f14 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -2310,6 +2310,13 @@ TEST_F(OEMCryptoLoadsCertificateAlternates, TestSignaturePKCS1) {
 // those devices.
 class OEMCryptoCastReceiverTest : public OEMCryptoLoadsCertificateAlternates {
  protected:
+  void SetUp() override {
+    OEMCryptoLoadsCertificateAlternates::SetUp();
+    if (!global_features.cast_receiver) {
+      GTEST_SKIP() << "OEMCrypto does not support CAST Receiver functionality";
+    }
+  }
+
   vector<uint8_t> encode(uint8_t type, const vector<uint8_t>& substring) {
     vector<uint8_t> result;
     result.push_back(type);
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test_main.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test_main.cpp
index 8a702cf4..0779b11c 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test_main.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test_main.cpp
@@ -46,7 +46,13 @@ int main(int argc, char** argv) {
   }
   wvutil::g_cutoff = static_cast<wvutil::LogPriority>(verbosity);
   wvoec::global_features.Initialize();
-  wvoec::global_features.set_cast_receiver(is_cast_receiver);
+  if (is_cast_receiver) {
+    // Turn it on if passed in on the command line. Do not turn these tests off
+    // automtically -- instead, we'll let the caller filter them out if they
+    // need to. These tests will normally only run if the device claims to
+    // support being a cast receiver.
+    wvoec::global_features.set_cast_receiver(is_cast_receiver);
+  }
   // Init GTest after device properties has been initialized.
   ::testing::InitGoogleTest(&argc, argv);
   // If the user requests --no_filter, we don't change the filter, otherwise, we