diff --git a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
index 5084cc30..28614f20 100644
--- a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
+++ b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
@@ -162,8 +162,6 @@ std::string DeviceFeatures::RestrictFilter(const std::string& initial_filter) {
   if (!generic_crypto)                FilterOut(&filter, "*GenericCrypto*");
   if (!supports_cas)                  FilterOut(&filter, "*CasOnly*");
   if (derive_key_method == NO_METHOD) FilterOut(&filter, "*SessionTest*");
-  if (provisioning_method != OEMCrypto_BootCertificateChain)
-                                      FilterOut(&filter, "*Prov40*");
   if (!supports_rsa_3072)             FilterOut(&filter, "*RSAKey3072*");
   if (api_version < 17)               FilterOut(&filter, "*API17*");
   if (api_version < 18)               FilterOut(&filter, "*API18*");
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h
index 48e5e8c8..ad47cbaa 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h
@@ -45,7 +45,14 @@ class OEMCryptoProv30Test : public OEMCryptoClientTest {
 };
 
 // This class is for tests that have boot certificate chain instead of a keybox.
-class OEMCryptoProv40Test : public OEMCryptoClientTest {};
+class OEMCryptoProv40Test : public OEMCryptoClientTest {
+  void SetUp() override {
+    OEMCryptoClientTest::SetUp();
+    if (global_features.provisioning_method != OEMCrypto_BootCertificateChain) {
+      GTEST_SKIP() << "Test for Prov 4.0 devices only.";
+    }
+  }
+};
 
 //
 // Certificate Root of Trust Tests