diff --git a/.gitlab/tests/cram/wnc-freedom/100-pwhm.t b/.gitlab/tests/cram/wnc-freedom/100-pwhm.t
index e4b177f914..2da29e97b9 100644
--- a/.gitlab/tests/cram/wnc-freedom/100-pwhm.t
+++ b/.gitlab/tests/cram/wnc-freedom/100-pwhm.t
@@ -81,6 +81,11 @@ Test activation of access point 1:
   Down
   Up
 
+Save hostap pid:
+
+  $ hostap_pid=$(R pgrep -f 'hostapd')
+  $ R logger -t cram "hostap PID : $hostap_pid"
+
 Test activation of access point 2:
 
   $ R logger -t cram "Test AccessPoint 2 activation "$(get_ssid_ref 2)""
@@ -269,11 +274,11 @@ Check that hostapd is operating as expected:
 
   $ R logger -t cram "Check that hostapd is operating"
 
-  $ R "ps axw" | sed -nE 's/.*(hostapd.*)/\1/p' | head -1 | tr -s ' ' '\n' | LC_ALL=C sort
+  $ R "ps axw" | sed -nE 's/.*(hostapd .*)/\1/p' | head -1 | tr -s ' ' '\n' | LC_ALL=C sort
   -ddt
-  /tmp/wlan0_hapd.conf
-  /tmp/wlan1_hapd.conf
+  -g
   /tmp/wlan2_hapd.conf
+  /var/run/hostapd/global\.0x.* (re)
   hostapd
 
   $ R "ubus list | grep hostapd. | sort"
@@ -504,6 +509,11 @@ Test deactivation of access point 2:
   Down
   Up
 
+Before deactivating last AP (ie stopping hostpad), check if hostap pid has changed or not:
+
+  $ if [ "$(R pgrep -f 'hostapd')" = "$hostap_pid" ]; then echo "true"; else echo "hostap restarted during the test !"; fi
+  true
+
 Test deactivation of access point 1:
 
   $ R logger -t cram "Test AccessPoint 1 deactivation "$(get_ssid_ref 1)""
diff --git a/.gitlab/tests/cram/wnc-freedom/101-mlo.t b/.gitlab/tests/cram/wnc-freedom/101-mlo.t
index a2dfb4cbaa..523a021e4c 100644
--- a/.gitlab/tests/cram/wnc-freedom/101-mlo.t
+++ b/.gitlab/tests/cram/wnc-freedom/101-mlo.t
@@ -115,6 +115,11 @@ Test activation of access point 1:
   Down
   Up
 
+Save hostap pid:
+
+  $ hostap_pid=$(R pgrep -f 'hostapd')
+  $ R logger -t cram "hostap PID : $hostap_pid"
+
 Test activation of access point 2:
 
   $ R logger -t cram "Enable AP 2 "$(get_ssid_ref 2)""
@@ -303,11 +308,11 @@ Check that hostapd is operating as expected:
 
   $ R logger -t cram "Check that hostapd is operating"
 
-  $ R "ps axw" | sed -nE 's/.*(hostapd.*)/\1/p' | head -1 | tr -s ' ' '\n' | LC_ALL=C sort
+  $ R "ps axw" | sed -nE 's/.*(hostapd .*)/\1/p' | head -1 | tr -s ' ' '\n' | LC_ALL=C sort
   -ddt
-  /tmp/wlan0_hapd.conf
-  /tmp/wlan1_hapd.conf
+  -g
   /tmp/wlan2_hapd.conf
+  /var/run/hostapd/global\.0x.* (re)
   hostapd
 
   $ R "ubus list | grep hostapd. | sort"
@@ -529,6 +534,11 @@ Test deactivation of access point 2:
   Down
   Up
 
+Before deactivating last AP (ie stopping hostpad), check if hostap pid has changed or not:
+
+  $ if [ "$(R pgrep -f 'hostapd')" = "$hostap_pid" ]; then echo "true"; else echo "hostap restarted during the test !"; fi
+  true
+
 Test deactivation of access point 1:
 
   $ R logger -t cram "Disable AP 1 "$(get_ssid_ref 1)""