diff --git a/client/site_tests/platform_FilePerms/platform_FilePerms.py b/client/site_tests/platform_FilePerms/platform_FilePerms.py
index 4081a78..d04d266 100644
--- a/client/site_tests/platform_FilePerms/platform_FilePerms.py
+++ b/client/site_tests/platform_FilePerms/platform_FilePerms.py
@@ -72,10 +72,10 @@
             'type': 'tmpfs',
             'options': standard_rw_options + ['mode=755']},
         # Special case, we want to track group/mode too.
-        # gid 236 == debugfs-access
+        # gid 605 == debugfs-access
         '/run/debugfs_gpu': {
             'type': 'debugfs',
-            'options': standard_rw_options + ['gid=236', 'mode=750']},
+            'options': standard_rw_options + ['gid=605', 'mode=750']},
         '/run/lock': {'type': 'tmpfs', 'options': standard_rw_options},
         '/sys': {'type': 'sysfs', 'options': standard_rw_options},
         '/sys/fs/cgroup': {
diff --git a/client/site_tests/security_AccountsBaseline/baseline.group b/client/site_tests/security_AccountsBaseline/baseline.group
index 9228a47..8d9bcc1 100644
--- a/client/site_tests/security_AccountsBaseline/baseline.group
+++ b/client/site_tests/security_AccountsBaseline/baseline.group
@@ -53,7 +53,7 @@
 tlsdate-dbus:!:233:
 tlsdate:!:234:
 debugd-logs:!:235:
-debugfs-access:!:236:
+debugfs-access:!:605:
 shill-crypto:!:237:
 avahi:!:238:
 p2p:!:239:
diff --git a/client/site_tests/security_AccountsBaseline/baseline.passwd b/client/site_tests/security_AccountsBaseline/baseline.passwd
index 4acaf6a..275fa35 100644
--- a/client/site_tests/security_AccountsBaseline/baseline.passwd
+++ b/client/site_tests/security_AccountsBaseline/baseline.passwd
@@ -39,7 +39,7 @@
 tlsdate-dbus:!:233:233::/dev/null:/bin/false
 tlsdate:!:234:234::/dev/null:/bin/false
 debugd-logs:!:235:235::/dev/null:/bin/false
-debugfs-access:!:236:236::/dev/null:/bin/false
+debugfs-access:!:605:605::/dev/null:/bin/false
 shill-crypto:!:237:237::/dev/null:/bin/false
 avahi:!:238:238::/dev/null:/bin/false
 p2p:!:239:239::/dev/null:/bin/false