diff --git a/pkg/sentry/fsimpl/cgroupfs/devices.go b/pkg/sentry/fsimpl/cgroupfs/devices.go
index c91e52b4c..14b4aac88 100644
--- a/pkg/sentry/fsimpl/cgroupfs/devices.go
+++ b/pkg/sentry/fsimpl/cgroupfs/devices.go
@@ -126,7 +126,7 @@ func newDevicesController(fs *filesystem) *devicesController {
 		allow:       true,
 		deviceRules: []deviceRule{},
 	}
-	c.controllerCommon.init(kernel.CgroupControllerJob, fs)
+	c.controllerCommon.init(kernel.CgroupControllerDevices, fs)
 	return c
 }
 
diff --git a/test/syscalls/linux/cgroup.cc b/test/syscalls/linux/cgroup.cc
index fe09b29cd..84dc9c7df 100644
--- a/test/syscalls/linux/cgroup.cc
+++ b/test/syscalls/linux/cgroup.cc
@@ -50,7 +50,7 @@ using ::testing::Key;
 using ::testing::Not;
 
 std::vector<std::string> known_controllers = {
-    "cpu", "cpuset", "cpuacct", "job", "memory", "pids",
+    "cpu", "cpuset", "cpuacct", "devices", "job", "memory", "pids",
 };
 
 bool CgroupsAvailable() {