diff --git a/features/cellular/UNITTESTS/at/at_cellularnetwork/test_at_cellularnetwork.h b/features/cellular/UNITTESTS/at/at_cellularnetwork/test_at_cellularnetwork.h
index 569bf54ce9..f36fdf034a 100644
--- a/features/cellular/UNITTESTS/at/at_cellularnetwork/test_at_cellularnetwork.h
+++ b/features/cellular/UNITTESTS/at/at_cellularnetwork/test_at_cellularnetwork.h
@@ -44,7 +44,7 @@ public:
 
     void test_AT_CellularNetwork_get_rate_control();
 
-    void test_AT_CellularNetwork_get_backoff_time();
+    void test_AT_CellularNetwork_get_apn_backoff_timer();
 
     void test_AT_CellularNetwork_get_ip_address();
 
diff --git a/features/cellular/UNITTESTS/makefile_defines.txt b/features/cellular/UNITTESTS/makefile_defines.txt
index 511c09128f..de88749f87 100755
--- a/features/cellular/UNITTESTS/makefile_defines.txt
+++ b/features/cellular/UNITTESTS/makefile_defines.txt
@@ -28,6 +28,6 @@ INCLUDE_DIRS =\
   /usr/include\
   $(CPPUTEST_HOME)/include\
 
-CPPUTESTFLAGS = -D__thumb2__ -w -D__INLINE=__inline
+CPPUTESTFLAGS = -D__thumb2__ -w -D__INLINE=__inline -DMBED_CONF_CELLULAR_MUX_ENABLED=1
 CPPUTEST_CFLAGS += -std=gnu99
 
diff --git a/features/cellular/UNITTESTS/run_tests b/features/cellular/UNITTESTS/run_tests
index db8d809964..c8c81bb6aa 100755
--- a/features/cellular/UNITTESTS/run_tests
+++ b/features/cellular/UNITTESTS/run_tests
@@ -1,6 +1,6 @@
 #!/bin/bash
 echo
-echo Build Connection helper unit tests
+echo Build Cellular unit tests
 echo
 
 #replace by empty string if no branch coverage is needed
@@ -10,7 +10,7 @@ branch_cov=""
 branch_data="--no-branch-coverage"
 
 # Remember to add new test folder to Makefile
-make clean
+make clean >/dev/null 2>&1
 make all
 
 echo
diff --git a/features/cellular/UNITTESTS/stubs/cellular_mux_stub.cpp b/features/cellular/UNITTESTS/stubs/cellular_mux_stub.cpp
index 40b957cf3e..48689c44be 100644
--- a/features/cellular/UNITTESTS/stubs/cellular_mux_stub.cpp
+++ b/features/cellular/UNITTESTS/stubs/cellular_mux_stub.cpp
@@ -60,3 +60,7 @@ ssize_t Mux::user_data_rx(void* buffer, size_t size)
     return cellular_mux_stub::size_value;
 }
 
+short Mux::poll()
+{
+    return POLLIN | POLLOUT;
+}