diff --git a/.gitlab/tests/cram/arcadyan-mozart/110-prplmesh-dataelements.t b/.gitlab/tests/cram/arcadyan-mozart/110-prplmesh-dataelements.t
index 8aad85138d..05145257c9 100644
--- a/.gitlab/tests/cram/arcadyan-mozart/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/arcadyan-mozart/110-prplmesh-dataelements.t
@@ -195,7 +195,7 @@ Check that prplmesh is operational:
   Mode: Agent+Controller
   Controller:
           bridge MAC: [0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re)
-          1 agent(s) connected
+          [1-9]+ agent\(s\) connected (re)
   Agent:
           MAC address: [0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re)
           management mode: Multi-AP-Controller-and-Agent
@@ -215,6 +215,13 @@ Check that prplmesh is operational:
                   current state: OPERATIONAL
                   best state: OPERATIONAL
 
+Assert agent count matches testbed topology (testbed-01: 1, testbed-02: 2 with HomePlug-backhauled TL-WPA7817, see PCF-2504):
+
+  $ ACT=$(R "/opt/prplmesh/bin/prplmesh_cli -c status -o pretty" \
+  >     | awk '/agent\(s\) connected/ {print $1}')
+  $ if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-02; then EXP=2; else EXP=1; fi
+  $ test "$ACT" = "$EXP" || echo "agent count mismatch: actual=$ACT expected=$EXP"
+
 Check that controller received correct info about wifi subsystem:
 
   $ R logger -t cram "Check controller info about network"
diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
index 51697a5565..38c2e76105 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
@@ -179,7 +179,7 @@ Check that prplmesh is operational:
   Mode: Agent+Controller
   Controller:
           bridge MAC: (4C:BA:7D|A8:C2:46|AC:9A:96):[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re)
-          1 agent(s) connected
+          [1-9]+ agent\(s\) connected (re)
   Agent:
           MAC address: [0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2} (re)
           management mode: Multi-AP-Controller-and-Agent
@@ -199,6 +199,13 @@ Check that prplmesh is operational:
                   current state: OPERATIONAL
                   best state: OPERATIONAL
 
+Assert agent count matches testbed topology (testbed-01: 1, testbed-02: 2 with HomePlug-backhauled TL-WPA7817, see PCF-2504):
+
+  $ ACT=$(R "/opt/prplmesh/bin/prplmesh_cli -c status -o pretty" \
+  >     | awk '/agent\(s\) connected/ {print $1}')
+  $ if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-02; then EXP=2; else EXP=1; fi
+  $ test "$ACT" = "$EXP" || echo "agent count mismatch: actual=$ACT expected=$EXP"
+
 Check that controller received correct info about wifi subsystem:
 
   $ R logger -t cram "Check controller info about network"
diff --git a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
index 6a0033f2f4..3d3d9eb75e 100644
--- a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
@@ -212,7 +212,7 @@ Check that prplmesh is operational:
 Assert agent count matches testbed topology (testbed-01: 1, testbed-02: 2 with HomePlug-backhauled TL-WPA7817, see PCF-2504):
 
   $ ACT=$(R "/opt/prplmesh/bin/prplmesh_cli -c status -o pretty" \
-  >     | sed -nE 's/.* ([0-9]+) agent\(s\) connected.*/\1/p')
+  >     | awk '/agent\(s\) connected/ {print $1}')
   $ if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-02; then EXP=2; else EXP=1; fi
   $ test "$ACT" = "$EXP" || echo "agent count mismatch: actual=$ACT expected=$EXP"