diff --git a/tests/eas/load_tracking.py b/tests/eas/load_tracking.py
index 379aada1d261a2cf87b68a15c28636b47e4bb700..d73a0710f324b2f958917af1b74287a735fc50a7 100644
--- a/tests/eas/load_tracking.py
+++ b/tests/eas/load_tracking.py
@@ -972,30 +972,25 @@ class _PELTTaskGroupsTest(LisaTest):
 
         # Freeze userspace tasks
         cls._log.info('Freezing userspace tasks')
-        te.target.cgroups.freeze(Executor.critical_tasks[te.target.os])
-
-        cls._log.info('FTrace events collection enabled')
-        te.ftrace.start()
-
-        # Run tasks
-        cls._log.info('Running the tasks')
-        # Run all tasks in background and wait for completion
-        for se in cls.root_group.iter_nodes():
-            if se.is_task:
-                # Run tasks
-                se.wload.run(out_dir=test_dir, cpus=se.cpus,
-                             cgroup=se.parent.name, background=True)
-        sleep(max_duration)
-
-        te.ftrace.stop()
-
-        trace_file = os.path.join(test_dir, 'trace.dat')
-        te.ftrace.get_trace(trace_file)
-        cls._log.info('Collected FTrace binary trace: %s', trace_file)
-
-        # Un-freeze userspace tasks
-        cls._log.info('Un-freezing userspace tasks')
-        te.target.cgroups.freeze(thaw=True)
+        with te.freeze_userspace():
+            cls._log.info('FTrace events collection enabled')
+            te.ftrace.start()
+
+            # Run tasks
+            cls._log.info('Running the tasks')
+            # Run all tasks in background and wait for completion
+            for se in cls.root_group.iter_nodes():
+                if se.is_task:
+                    # Run tasks
+                    se.wload.run(out_dir=test_dir, cpus=se.cpus,
+                                 cgroup=se.parent.name, background=True)
+            sleep(max_duration)
+
+            te.ftrace.stop()
+
+            trace_file = os.path.join(test_dir, 'trace.dat')
+            te.ftrace.get_trace(trace_file)
+            cls._log.info('Collected FTrace binary trace: %s', trace_file)
 
         # Extract trace
         cls.trace = Trace(None, test_dir, te.ftrace.events)