diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index e6f15ff..74b88a7 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -259,11 +259,11 @@
     }
 
     /**
-     * @return The first vendor API level when the vendor images for an SoC that is qualified for
-     *     vendor freeze are first released with this property, or 0 if the property is not set.
+     * @return The vendor API level that the device as a whole must conform to, this value should be
+     *     available on both GRF and non-GRF devices.
      */
     protected static int getFirstVendorApiLevel() {
-        return SystemProperties.getInt("ro.board.first_api_level", 0);
+        return SystemProperties.getInt("ro.vendor.api_level", -1);
     }
 
     protected void assumeSupportedDevice() {