diff --git a/.gitlab/tests/cram/generic/cellular-manager/004-set-trusted-elements.t b/.gitlab/tests/cram/generic/acceleration-plan-components/018-cellular-trusted-elements.t
similarity index 73%
rename from .gitlab/tests/cram/generic/cellular-manager/004-set-trusted-elements.t
rename to .gitlab/tests/cram/generic/acceleration-plan-components/018-cellular-trusted-elements.t
index 161b85c705..248d89416f 100644
--- a/.gitlab/tests/cram/generic/cellular-manager/004-set-trusted-elements.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/018-cellular-trusted-elements.t
@@ -1,12 +1,8 @@
-Skip on testbed-02 until PCF-2585 is resolved:
-
-  $ if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-02; then exit 80; fi
-
 Create R alias:
 
   $ alias R="${CRAM_REMOTE_COMMAND:-}"
 
-  $ R logger -t cram "Starting with CellularManager setup 004-set-trusted-elements.t"
+  $ R logger -t cram "Starting with CellularManager setup 018-cellular-trusted-elements.t"
 
 Read the IMSI value using mmcli:
 
@@ -29,4 +25,4 @@ Wait for SIM registration and modem setup:
 
   $ sleep 30
 
-  $ R logger -t cram "Completed with CellularManager setup 004-set-trusted-elements.t"
+  $ R logger -t cram "Completed with CellularManager setup 018-cellular-trusted-elements.t"
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/50-cellular-offline.t b/.gitlab/tests/cram/generic/acceleration-plan-components/50-cellular-offline.t
index 9fc717b619..b0cec10e3d 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/50-cellular-offline.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/50-cellular-offline.t
@@ -22,3 +22,6 @@ Check datamodel parameters that should be set when no SIM is detected:
   Device.Cellular.Interface.1.
 
   $ R "ubus-cli -al Cellular.Interface.1.LowerLayers? | awk NF"
+
+  $ R "echo protected\; Cellular.Interface.1.InternalName? | xargs ba-cli -al | grep -v '> ' | awk NF"
+  .*\/org\/freedesktop\/ModemManager[0-9]\/Modem\/[0-9]+ (re)