diff --git a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
index 0660ca53..ca471a85 100644
--- a/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
+++ b/libwvdrmengine/oemcrypto/test/oec_device_features.cpp
@@ -164,8 +164,6 @@ std::string DeviceFeatures::RestrictFilter(const std::string& initial_filter) {
   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_OEMCertificate)    FilterOut(&filter, "*Prov30*");
   if (provisioning_method != OEMCrypto_BootCertificateChain)
                                       FilterOut(&filter, "*Prov40*");
   if (!supports_rsa_3072)             FilterOut(&filter, "*RSAKey3072*");
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp
index ea687eea..1c0ddd27 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp
@@ -768,6 +768,9 @@ TEST_F(OEMCryptoLoadsCertificate, CertificateProvisionBadRange4_API16) {
 // Verify that RewrapDeviceRSAKey checks pointers are within the provisioning
 // message.
 TEST_F(OEMCryptoLoadsCertificate, CertificateProvisionBadRange5Prov30_API16) {
+  if (global_features.provisioning_method != OEMCrypto_OEMCertificate) {
+    GTEST_SKIP() << "Test for Prov 3.0 devices only.";
+  }
   Session s;
   ProvisioningRoundTrip provisioning_messages(&s, encoded_rsa_key_);
   provisioning_messages.PrepareSession(keybox_);
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h
index 2233842f..48e5e8c8 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h
@@ -35,7 +35,14 @@ class OEMCryptoKeyboxTest : public OEMCryptoClientTest {
 };
 
 // This class is for tests that have an OEM Certificate instead of a keybox.
-class OEMCryptoProv30Test : public OEMCryptoClientTest {};
+class OEMCryptoProv30Test : public OEMCryptoClientTest {
+  void SetUp() override {
+    OEMCryptoClientTest::SetUp();
+    if (global_features.provisioning_method != OEMCrypto_OEMCertificate) {
+      GTEST_SKIP() << "Test for Prov 3.0 devices only.";
+    }
+  }
+};
 
 // This class is for tests that have boot certificate chain instead of a keybox.
 class OEMCryptoProv40Test : public OEMCryptoClientTest {};
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 54140c52..c2a7a9f7 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -1739,6 +1739,9 @@ TEST_F(OEMCryptoLoadsCertificate,
 TEST_F(
     OEMCryptoLoadsCertificate,
     OEMCryptoMemoryLoadProvisioningForOutOfRangeCoreMessageEncMessageKeyLengthProv30) {
+  if (global_features.provisioning_method != OEMCrypto_OEMCertificate) {
+    GTEST_SKIP() << "Test for Prov 3.0 devices only.";
+  }
   TestLoadProvisioningForOutOfRangeSubstringOffsetAndLengths(
       [](size_t response_message_length,
          ProvisioningRoundTrip* provisioning_messages) {
@@ -1752,6 +1755,9 @@ TEST_F(
 TEST_F(
     OEMCryptoLoadsCertificate,
     OEMCryptoMemoryLoadProvisioningForOutOfRangeCoreMessageEncMessageKeyOffsetProv30) {
+  if (global_features.provisioning_method != OEMCrypto_OEMCertificate) {
+    GTEST_SKIP() << "Test for Prov 3.0 devices only.";
+  }
   TestLoadProvisioningForOutOfRangeSubstringOffsetAndLengths(
       [](size_t response_message_length,
          ProvisioningRoundTrip* provisioning_messages) {