diff --git a/tests/devkeys-pkc/dev_firmware.keyblock b/tests/devkeys-pkc/dev_firmware.keyblock
new file mode 100644
index 0000000000..d0411acd10
Binary files /dev/null and b/tests/devkeys-pkc/dev_firmware.keyblock differ
diff --git a/tests/devkeys-pkc/dev_firmware_data_key.vbprivk b/tests/devkeys-pkc/dev_firmware_data_key.vbprivk
new file mode 100644
index 0000000000..1ef7dbdc24
Binary files /dev/null and b/tests/devkeys-pkc/dev_firmware_data_key.vbprivk differ
diff --git a/tests/devkeys-pkc/dev_firmware_data_key.vbpubk b/tests/devkeys-pkc/dev_firmware_data_key.vbpubk
new file mode 100644
index 0000000000..7bd1716698
Binary files /dev/null and b/tests/devkeys-pkc/dev_firmware_data_key.vbpubk differ
diff --git a/tests/devkeys-pkc/ec.keyblock b/tests/devkeys-pkc/ec.keyblock
new file mode 100644
index 0000000000..6b088f325e
Binary files /dev/null and b/tests/devkeys-pkc/ec.keyblock differ
diff --git a/tests/devkeys-pkc/ec_data_key.vbprivk b/tests/devkeys-pkc/ec_data_key.vbprivk
new file mode 100644
index 0000000000..9f194ce9b5
Binary files /dev/null and b/tests/devkeys-pkc/ec_data_key.vbprivk differ
diff --git a/tests/devkeys-pkc/ec_data_key.vbpubk b/tests/devkeys-pkc/ec_data_key.vbpubk
new file mode 100644
index 0000000000..5804dfd614
Binary files /dev/null and b/tests/devkeys-pkc/ec_data_key.vbpubk differ
diff --git a/tests/devkeys-pkc/ec_root_key.vbprivk b/tests/devkeys-pkc/ec_root_key.vbprivk
new file mode 100644
index 0000000000..4914472084
Binary files /dev/null and b/tests/devkeys-pkc/ec_root_key.vbprivk differ
diff --git a/tests/devkeys-pkc/ec_root_key.vbpubk b/tests/devkeys-pkc/ec_root_key.vbpubk
new file mode 100644
index 0000000000..76c26f94ab
Binary files /dev/null and b/tests/devkeys-pkc/ec_root_key.vbpubk differ
diff --git a/tests/devkeys-pkc/firmware.keyblock b/tests/devkeys-pkc/firmware.keyblock
new file mode 100644
index 0000000000..1e2273e542
Binary files /dev/null and b/tests/devkeys-pkc/firmware.keyblock differ
diff --git a/tests/devkeys-pkc/firmware_bmpfv.bin b/tests/devkeys-pkc/firmware_bmpfv.bin
new file mode 100644
index 0000000000..3e9af97600
Binary files /dev/null and b/tests/devkeys-pkc/firmware_bmpfv.bin differ
diff --git a/tests/devkeys-pkc/firmware_data_key.vbprivk b/tests/devkeys-pkc/firmware_data_key.vbprivk
new file mode 100644
index 0000000000..49e57513f8
Binary files /dev/null and b/tests/devkeys-pkc/firmware_data_key.vbprivk differ
diff --git a/tests/devkeys-pkc/firmware_data_key.vbpubk b/tests/devkeys-pkc/firmware_data_key.vbpubk
new file mode 100644
index 0000000000..804d566cba
Binary files /dev/null and b/tests/devkeys-pkc/firmware_data_key.vbpubk differ
diff --git a/tests/devkeys-pkc/installer_kernel.keyblock b/tests/devkeys-pkc/installer_kernel.keyblock
new file mode 100644
index 0000000000..cfa3bd187a
Binary files /dev/null and b/tests/devkeys-pkc/installer_kernel.keyblock differ
diff --git a/tests/devkeys-pkc/installer_kernel_data_key.vbprivk b/tests/devkeys-pkc/installer_kernel_data_key.vbprivk
new file mode 100644
index 0000000000..0379595205
Binary files /dev/null and b/tests/devkeys-pkc/installer_kernel_data_key.vbprivk differ
diff --git a/tests/devkeys-pkc/installer_kernel_data_key.vbpubk b/tests/devkeys-pkc/installer_kernel_data_key.vbpubk
new file mode 100644
index 0000000000..3e9e67c5c1
Binary files /dev/null and b/tests/devkeys-pkc/installer_kernel_data_key.vbpubk differ
diff --git a/tests/devkeys-pkc/kernel.keyblock b/tests/devkeys-pkc/kernel.keyblock
new file mode 100644
index 0000000000..9740be4e60
Binary files /dev/null and b/tests/devkeys-pkc/kernel.keyblock differ
diff --git a/tests/devkeys-pkc/kernel_data_key.vbprivk b/tests/devkeys-pkc/kernel_data_key.vbprivk
new file mode 100644
index 0000000000..8d392fb294
Binary files /dev/null and b/tests/devkeys-pkc/kernel_data_key.vbprivk differ
diff --git a/tests/devkeys-pkc/kernel_data_key.vbpubk b/tests/devkeys-pkc/kernel_data_key.vbpubk
new file mode 100644
index 0000000000..80910b77c0
Binary files /dev/null and b/tests/devkeys-pkc/kernel_data_key.vbpubk differ
diff --git a/tests/devkeys-pkc/kernel_subkey.vbprivk b/tests/devkeys-pkc/kernel_subkey.vbprivk
new file mode 100644
index 0000000000..195b1bf5b8
Binary files /dev/null and b/tests/devkeys-pkc/kernel_subkey.vbprivk differ
diff --git a/tests/devkeys-pkc/kernel_subkey.vbpubk b/tests/devkeys-pkc/kernel_subkey.vbpubk
new file mode 100644
index 0000000000..a24a036d19
Binary files /dev/null and b/tests/devkeys-pkc/kernel_subkey.vbpubk differ
diff --git a/tests/devkeys-pkc/key.versions b/tests/devkeys-pkc/key.versions
new file mode 100644
index 0000000000..59d8748eb7
--- /dev/null
+++ b/tests/devkeys-pkc/key.versions
@@ -0,0 +1,4 @@
+firmware_key_version=1
+firmware_version=1
+kernel_key_version=1
+kernel_version=1
diff --git a/tests/devkeys/nv_pkc.pem b/tests/devkeys-pkc/nv_pkc.pem
similarity index 100%
rename from tests/devkeys/nv_pkc.pem
rename to tests/devkeys-pkc/nv_pkc.pem
diff --git a/tests/devkeys-pkc/recovery_kernel.keyblock b/tests/devkeys-pkc/recovery_kernel.keyblock
new file mode 100644
index 0000000000..ad16e39972
Binary files /dev/null and b/tests/devkeys-pkc/recovery_kernel.keyblock differ
diff --git a/tests/devkeys-pkc/recovery_kernel_data_key.vbprivk b/tests/devkeys-pkc/recovery_kernel_data_key.vbprivk
new file mode 100644
index 0000000000..0379595205
Binary files /dev/null and b/tests/devkeys-pkc/recovery_kernel_data_key.vbprivk differ
diff --git a/tests/devkeys-pkc/recovery_kernel_data_key.vbpubk b/tests/devkeys-pkc/recovery_kernel_data_key.vbpubk
new file mode 100644
index 0000000000..3e9e67c5c1
Binary files /dev/null and b/tests/devkeys-pkc/recovery_kernel_data_key.vbpubk differ
diff --git a/tests/devkeys-pkc/recovery_key.vbprivk b/tests/devkeys-pkc/recovery_key.vbprivk
new file mode 100644
index 0000000000..6c7ab3630d
Binary files /dev/null and b/tests/devkeys-pkc/recovery_key.vbprivk differ
diff --git a/tests/devkeys-pkc/recovery_key.vbpubk b/tests/devkeys-pkc/recovery_key.vbpubk
new file mode 100644
index 0000000000..86d2471a08
Binary files /dev/null and b/tests/devkeys-pkc/recovery_key.vbpubk differ
diff --git a/tests/devkeys-pkc/root_key.vbprivk b/tests/devkeys-pkc/root_key.vbprivk
new file mode 100644
index 0000000000..74c47dd784
Binary files /dev/null and b/tests/devkeys-pkc/root_key.vbprivk differ
diff --git a/tests/devkeys-pkc/root_key.vbpubk b/tests/devkeys-pkc/root_key.vbpubk
new file mode 100644
index 0000000000..dfca9d054f
Binary files /dev/null and b/tests/devkeys-pkc/root_key.vbpubk differ