diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 7525e5e2..9ecd2f95 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -1494,8 +1494,7 @@ TEST_F(OEMCryptoClientTest, NormalGetKeyData) {
 
   OEMCryptoResult sts;
   uint8_t key_data[256];
-  uint32_t req_len = 256;
-  size_t key_data_len = req_len;
+  size_t key_data_len = sizeof(key_data);
   sts = OEMCrypto_GetKeyData(key_data, &key_data_len);
 
   uint32_t* data = reinterpret_cast<uint32_t*>(key_data);
@@ -1513,38 +1512,6 @@ TEST_F(OEMCryptoClientTest, NormalGetKeyData) {
   testTearDown();
 }
 
-TEST_F(OEMCryptoClientTest, DISABLED_CheckSystemID) {
-  testSetUp();
-
-  OEMCryptoResult sts;
-  uint8_t key_data[256];
-  uint32_t req_len = 256;
-  size_t key_data_len = req_len;
-  sts = OEMCrypto_GetKeyData(key_data, &key_data_len);
-  ASSERT_EQ(OEMCrypto_SUCCESS, sts);
-
-  uint32_t* data = reinterpret_cast<uint32_t*>(key_data);
-  uint32_t system_id = htonl(data[1]);
-  if (system_id != 0x1019) {
-
-    cout << "================================================================\n"
-         << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"
-         << "WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING \n"
-         << "You have enabled the keybox tests.  This code WILL INSTALL A \n"
-         << "TEST KEYBOX.  IT WILL REPLACE THE EXISTING KEYBOX, and you will.\n"
-         << "NOT have access to production content.  Your current keybox has \n"
-         << "system id " << system_id << ".\n"
-         << "\n"
-         << "Continue? [y/N]:\n";
-    int answer = getchar();
-    if (tolower(answer) != 'y') {
-      cout << "Quitting tests.  whew, that was close.\n";
-      exit(1);
-    }
-  }
-  testTearDown();
-}
-
 TEST_F(OEMCryptoClientTest, KeyboxValid) {
   bool success;
   success = init();
@@ -1811,6 +1778,38 @@ class DISABLED_TestKeybox : public OEMCryptoClientTest {
   }
 };
 
+TEST_F(DISABLED_TestKeybox, CheckSystemID) {
+  testSetUp();
+
+  OEMCryptoResult sts;
+  uint8_t key_data[256];
+  size_t key_data_len = sizeof(key_data);
+  sts = OEMCrypto_GetKeyData(key_data, &key_data_len);
+  ASSERT_EQ(OEMCrypto_SUCCESS, sts);
+
+  uint32_t* data = reinterpret_cast<uint32_t*>(key_data);
+  uint32_t system_id = htonl(data[1]);
+  if (system_id != 0x1019) {
+
+    cout << "================================================================\n"
+         << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"
+         << "WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING \n"
+         << "You have enabled the keybox tests.  This code WILL INSTALL A \n"
+         << "TEST KEYBOX.  IT WILL REPLACE THE EXISTING KEYBOX, and you will.\n"
+         << "NOT have access to production content.  Your current keybox has \n"
+         << "system id " << system_id << ".\n"
+         << "\n"
+         << "Continue? [y/N]:\n";
+    int answer = getchar();
+    if (tolower(answer) != 'y') {
+      cout << "Quitting tests.  whew, that was close.\n";
+      exit(1);
+    }
+  }
+  testTearDown();
+}
+
+
 TEST_F(DISABLED_TestKeybox, GoodKeybox) {
   testSetUp();
   wvoec_mock::WidevineKeybox keybox = kValidKeybox02;