diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java
index 1188bb780fa93..5c552a2437c1c 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java
@@ -100,16 +100,17 @@ public class PackageManagerPresubmitTest {
             if ((protectionLevel & PermissionInfo.PROTECTION_FLAG_PRIVILEGED) != 0) {
                 boolean granted = (packageInfo.requestedPermissionsFlags[i]
                         & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
-                assertTrue("Permission " + pName + " should be granted to " + packageName, granted);
                 // if privapp permissions are enforced, platform permissions must be whitelisted
                 // in SystemConfig
                 if (platformPermission && RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE) {
                     assertTrue("Permission " + pName
-                                    + " should be declared in privapp-permissions-platform.xml "
-                                    + "or privapp-permissions-<product>.xml file for package "
+                                    + " should be declared in "
+                                    + "/etc/permissions/privapp-permissions-platform.xml "
+                                    + "or privapp-permissions-<device>.xml file for package "
                                     + packageName,
                             privAppPermissions.contains(pName));
                 }
+                assertTrue("Permission " + pName + " should be granted to " + packageName, granted);
             }
         }
     }