diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
index 8ac875bfa5..e91085e22d 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
@@ -1043,6 +1043,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_TRACES_LEVEL=500
   CONFIG_SAH_TRACES_SYSLOG_CONSOLE=y
   CONFIG_SAH_TRACE_NO_COLORS=y
+  CONFIG_SAH_WLD_ENABLE_USP_SERVER_SOCKET=y
   CONFIG_SAH_WLD_INIT_ORDER=60
   CONFIG_SAH_WLD_INIT_SCRIPT="prplmesh_whm"
   CONFIG_SDK=y
diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/102-pwhm-usp.t b/.gitlab/tests/cram/mxl25641-hdk-6/102-pwhm-usp.t
new file mode 120000
index 0000000000..3a013509c7
--- /dev/null
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/102-pwhm-usp.t
@@ -0,0 +1 @@
+../wifi/wifi-usp.t
\ No newline at end of file
diff --git a/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t b/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t
index fb9f7e3e7b..b0a8b85c10 100644
--- a/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t
+++ b/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t
@@ -1010,6 +1010,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_TRACES_LEVEL=500
   CONFIG_SAH_TRACES_SYSLOG_CONSOLE=y
   CONFIG_SAH_TRACE_NO_COLORS=y
+  CONFIG_SAH_WLD_ENABLE_USP_SERVER_SOCKET=y
   CONFIG_SAH_WLD_INIT_ORDER=60
   CONFIG_SAH_WLD_INIT_SCRIPT="prplmesh_whm"
   CONFIG_SDK=y
diff --git a/.gitlab/tests/cram/urx851-b0-dk/102-pwhm-usp.t b/.gitlab/tests/cram/urx851-b0-dk/102-pwhm-usp.t
new file mode 120000
index 0000000000..3a013509c7
--- /dev/null
+++ b/.gitlab/tests/cram/urx851-b0-dk/102-pwhm-usp.t
@@ -0,0 +1 @@
+../wifi/wifi-usp.t
\ No newline at end of file
diff --git a/.gitlab/tests/cram/wifi/wifi-usp.t b/.gitlab/tests/cram/wifi/wifi-usp.t
new file mode 100644
index 0000000000..d9b9a4eda2
--- /dev/null
+++ b/.gitlab/tests/cram/wifi/wifi-usp.t
@@ -0,0 +1,17 @@
+Create R alias:
+
+  $ alias R="${CRAM_REMOTE_COMMAND:-}"
+
+  $ R logger -t cram "Starting pwhm direct USP socket test ..."
+
+Check pwhm usp socket:
+
+  $ R "netstat -ap 2>/dev/null | grep 'LISTENING.*pwhm_usp.sock'"
+  .*LISTENING.*pwhm_usp.sock (re)
+
+Check if there is at least one connected client (should be beerocks processes):
+
+  $ R "netstat -ap 2>/dev/null | grep 'CONNECTED.*pwhm_usp.sock'| wc -l"
+  [1-9]$ (re)
+
+  $ R logger -t cram "Test finished!"
diff --git a/.gitlab/tests/cram/wnc-freedom/005-build-config.t b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
index f98bde2336..a473db2fac 100644
--- a/.gitlab/tests/cram/wnc-freedom/005-build-config.t
+++ b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
@@ -814,6 +814,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_TRACES_LEVEL=500
   CONFIG_SAH_TRACES_SYSLOG_CONSOLE=y
   CONFIG_SAH_TRACE_NO_COLORS=y
+  CONFIG_SAH_WLD_ENABLE_USP_SERVER_SOCKET=y
   CONFIG_SAH_WLD_INIT_ORDER=60
   CONFIG_SAH_WLD_INIT_SCRIPT="prplmesh_whm"
   CONFIG_SDK=y
diff --git a/.gitlab/tests/cram/wnc-freedom/102-pwhm-usp.t b/.gitlab/tests/cram/wnc-freedom/102-pwhm-usp.t
new file mode 120000
index 0000000000..3a013509c7
--- /dev/null
+++ b/.gitlab/tests/cram/wnc-freedom/102-pwhm-usp.t
@@ -0,0 +1 @@
+../wifi/wifi-usp.t
\ No newline at end of file
diff --git a/profiles/prpl.yml b/profiles/prpl.yml
index 71b43d87e5..fcdc3ae7f5 100644
--- a/profiles/prpl.yml
+++ b/profiles/prpl.yml
@@ -301,3 +301,4 @@ diffconfig: |
           CONFIG_SAH_MOD_AMXB_USP_REQUIRES_DEVICE_PREFIX=y
           CONFIG_INCLUDE_CONFIG=y
           CONFIG_PACKAGE_ipset=y
+          CONFIG_SAH_WLD_ENABLE_USP_SERVER_SOCKET=y