diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index f04dde94db3..044c0423304 100755
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -46,23 +46,6 @@ if [ -n "$BM_START_XORG" ]; then
   export DISPLAY=:0
 fi
 
-# Disable GPU frequency scaling
-DEVFREQ_GOVERNOR=`find /sys/devices -name governor | grep gpu || true`
-echo performance > $DEVFREQ_GOVERNOR || true
-
-# Disable CPU frequency scaling
-echo performance | tee -a /sys/devices/system/cpu/cpufreq/policy*/scaling_governor || true
-
-# The below would be generally useful, but a bug in drm/msm leaves the GPU
-# device in a broken state if we try to do it before the first client (Xorg 
-# in this case) connects.
-# TODO: Make it inconditional once https://gitlab.freedesktop.org/drm/msm/-/issues/5 is solved in Mesa CI's kernel
-if [ -n "$BM_START_XORG" ]; then
-  # Disable GPU runtime PM
-  GPU_AUTOSUSPEND=`find /sys/devices -name autosuspend_delay_ms | grep gpu | head -1`
-  echo -1 > $GPU_AUTOSUSPEND || true
-fi
-
 if sh $BARE_METAL_TEST_SCRIPT; then
   OK=1
 else
diff --git a/.gitlab-ci/lava.yml.jinja2 b/.gitlab-ci/lava.yml.jinja2
index e9735d6b3af..e8c74aac721 100644
--- a/.gitlab-ci/lava.yml.jinja2
+++ b/.gitlab-ci/lava.yml.jinja2
@@ -82,14 +82,9 @@ actions:
 
           - modprobe amdgpu || true
 
-          # Disable GPU frequency scaling
           - DEVFREQ_GOVERNOR=`find /sys/devices -name governor | grep gpu || true`
           - echo performance > $DEVFREQ_GOVERNOR || true
 
-          # Disable CPU frequency scaling
-          - echo performance | tee -a /sys/devices/system/cpu/cpufreq/policy*/scaling_governor || true
-
-          # Disable GPU runtime PM
           - GPU_AUTOSUSPEND=`find /sys/devices -name autosuspend_delay_ms | grep gpu | head -1`
           - echo -1 > $GPU_AUTOSUSPEND || true