diff --git a/libwvdrmengine/oemcrypto/test/ota_keybox_test.cpp b/libwvdrmengine/oemcrypto/test/ota_keybox_test.cpp
index e7d723af..1ead628d 100644
--- a/libwvdrmengine/oemcrypto/test/ota_keybox_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/ota_keybox_test.cpp
@@ -184,7 +184,12 @@ TEST_F(OTAKeyboxProvisioningTest, BasicTest) {
          << "Keybox valid after initialization. Skipping rest of test." << endl;
     return;
   }
-  ASSERT_EQ(result, OEMCrypto_ERROR_NEEDS_KEYBOX_PROVISIONING);
+  if (result != OEMCrypto_ERROR_NEEDS_KEYBOX_PROVISIONING) {
+    cout << "             "
+         << "OTA Keybox functions not supported. Skipping rest of test."
+         << endl;
+    return;
+  }
   cout << "             "
        << "OTA Keybox functions supported. Device needs provisioning." << endl;
   // TODO(fredgc): Make sure that partners can use a test cert when use_test_key