diff --git a/features/cellular/UNITTESTS/at/at_cellularbase/at_cellularbasetest.cpp b/features/cellular/UNITTESTS/at/at_cellularbase/at_cellularbasetest.cpp
index 0a12185c8a..0c7ff37f60 100644
--- a/features/cellular/UNITTESTS/at/at_cellularbase/at_cellularbasetest.cpp
+++ b/features/cellular/UNITTESTS/at/at_cellularbase/at_cellularbasetest.cpp
@@ -18,18 +18,23 @@
 #include "test_at_cellularbase.h"
 #include "AT_CellularBase.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(AT_CellularBase)
 {
     Test_AT_CellularBase *unit;
 
-    void setup() {
+    void setup() 
+    {
         unit = new Test_AT_CellularBase();
     }
 
-    void teardown() {
+    void teardown() 
+    {
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(AT_CellularBase, Create)
 {
diff --git a/features/cellular/UNITTESTS/at/at_cellularinformation/at_cellularinformationtest.cpp b/features/cellular/UNITTESTS/at/at_cellularinformation/at_cellularinformationtest.cpp
index 0da1fcb1fc..25581e69b1 100644
--- a/features/cellular/UNITTESTS/at/at_cellularinformation/at_cellularinformationtest.cpp
+++ b/features/cellular/UNITTESTS/at/at_cellularinformation/at_cellularinformationtest.cpp
@@ -17,18 +17,23 @@
 #include "CppUTest/TestHarness.h"
 #include "test_at_cellularinformation.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(AT_CellularInformation)
 {
     Test_AT_CellularInformation *unit;
 
-    void setup() {
+    void setup() 
+    {
         unit = new Test_AT_CellularInformation();
     }
 
-    void teardown() {
+    void teardown() 
+    {
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(AT_CellularInformation, Create)
 {
diff --git a/features/cellular/UNITTESTS/at/at_cellularnetwork/at_cellularnetworktest.cpp b/features/cellular/UNITTESTS/at/at_cellularnetwork/at_cellularnetworktest.cpp
index 07f011e395..538c527544 100644
--- a/features/cellular/UNITTESTS/at/at_cellularnetwork/at_cellularnetworktest.cpp
+++ b/features/cellular/UNITTESTS/at/at_cellularnetwork/at_cellularnetworktest.cpp
@@ -18,21 +18,26 @@
 #include "test_at_cellularnetwork.h"
 #include "ATHandler_stub.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(AT_CellularNetwork)
 {
     Test_AT_CellularNetwork *unit;
 
-    void setup() {
+    void setup() 
+    {
         unit = new Test_AT_CellularNetwork();
         ATHandler_stub::int_count = kRead_int_table_size;
         ATHandler_stub::read_string_index = kRead_string_table_size;
         ATHandler_stub::resp_stop_success_count = kResp_stop_count_default;
     }
 
-    void teardown() {
+    void teardown() 
+    {
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(AT_CellularNetwork, Create)
 {
diff --git a/features/cellular/UNITTESTS/at/at_cellularpower/at_cellularpowertest.cpp b/features/cellular/UNITTESTS/at/at_cellularpower/at_cellularpowertest.cpp
index 15d8634dae..2ce7b6dd02 100644
--- a/features/cellular/UNITTESTS/at/at_cellularpower/at_cellularpowertest.cpp
+++ b/features/cellular/UNITTESTS/at/at_cellularpower/at_cellularpowertest.cpp
@@ -17,6 +17,8 @@
 #include "CppUTest/TestHarness.h"
 #include "test_at_cellularpower.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(AT_CellularPower)
 {
     Test_AT_CellularPower *unit;
@@ -29,6 +31,7 @@ TEST_GROUP(AT_CellularPower)
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(AT_CellularPower, Create)
 {
diff --git a/features/cellular/UNITTESTS/at/at_cellularsim/at_cellularsimtest.cpp b/features/cellular/UNITTESTS/at/at_cellularsim/at_cellularsimtest.cpp
index 881585efb3..2d4c2c70ec 100644
--- a/features/cellular/UNITTESTS/at/at_cellularsim/at_cellularsimtest.cpp
+++ b/features/cellular/UNITTESTS/at/at_cellularsim/at_cellularsimtest.cpp
@@ -18,19 +18,24 @@
 #include "test_at_cellularsim.h"
 #include "ATHandler_stub.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(AT_CellularSIM)
 {
     Test_AT_CellularSIM *unit;
 
-    void setup() {
+    void setup() 
+    {
         unit = new Test_AT_CellularSIM();
         ATHandler_stub::read_string_index = kRead_string_table_size;
     }
 
-    void teardown() {
+    void teardown() 
+    {
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(AT_CellularSIM, Create)
 {
diff --git a/features/cellular/UNITTESTS/at/at_cellularsms/at_cellularsmstest.cpp b/features/cellular/UNITTESTS/at/at_cellularsms/at_cellularsmstest.cpp
index 2f2d48cf0d..d207cc8291 100644
--- a/features/cellular/UNITTESTS/at/at_cellularsms/at_cellularsmstest.cpp
+++ b/features/cellular/UNITTESTS/at/at_cellularsms/at_cellularsmstest.cpp
@@ -17,18 +17,23 @@
 #include "CppUTest/TestHarness.h"
 #include "test_at_cellularsms.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(AT_CellularSMS)
 {
     Test_AT_CellularSMS *unit;
 
-    void setup() {
+    void setup() 
+    {
         unit = new Test_AT_CellularSMS();
     }
 
-    void teardown() {
+    void teardown() 
+    {
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(AT_CellularSMS, Create)
 {
diff --git a/features/cellular/UNITTESTS/at/at_cellularstack/at_cellularstacktest.cpp b/features/cellular/UNITTESTS/at/at_cellularstack/at_cellularstacktest.cpp
index bd3993e3f2..60a5ab6664 100644
--- a/features/cellular/UNITTESTS/at/at_cellularstack/at_cellularstacktest.cpp
+++ b/features/cellular/UNITTESTS/at/at_cellularstack/at_cellularstacktest.cpp
@@ -17,18 +17,23 @@
 #include "CppUTest/TestHarness.h"
 #include "test_at_cellularstack.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(AT_CellularStack)
 {
     Test_AT_CellularStack *unit;
 
-    void setup() {
+    void setup()
+    {
         unit = new Test_AT_CellularStack();
     }
 
-    void teardown() {
+    void teardown() 
+    {
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(AT_CellularStack, Create)
 {
diff --git a/features/cellular/UNITTESTS/at/athandler/athandlertest.cpp b/features/cellular/UNITTESTS/at/athandler/athandlertest.cpp
index 278fcd4b1b..b8b46b2ca8 100644
--- a/features/cellular/UNITTESTS/at/athandler/athandlertest.cpp
+++ b/features/cellular/UNITTESTS/at/athandler/athandlertest.cpp
@@ -17,18 +17,23 @@
 #include "CppUTest/TestHarness.h"
 #include "test_athandler.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(ATHandler)
 {
     Test_ATHandler *unit;
 
-    void setup() {
+    void setup() 
+    {
         unit = new Test_ATHandler();
     }
 
-    void teardown() {
+    void teardown() 
+    {
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(ATHandler, Create)
 {
diff --git a/features/cellular/UNITTESTS/common/util/utiltest.cpp b/features/cellular/UNITTESTS/common/util/utiltest.cpp
index 839cdf2f98..52a6db6c07 100644
--- a/features/cellular/UNITTESTS/common/util/utiltest.cpp
+++ b/features/cellular/UNITTESTS/common/util/utiltest.cpp
@@ -17,18 +17,23 @@
 #include "CppUTest/TestHarness.h"
 #include "test_util.h"
 
+// AStyle ignored as the definition is not clear due to preprocessor usage
+// *INDENT-OFF*
 TEST_GROUP(util)
 {
     Test_util *unit;
 
-    void setup() {
+    void setup() 
+    {
         unit = new Test_util();
     }
 
-    void teardown() {
+    void teardown() 
+    {
         delete unit;
     }
 };
+// *INDENT-ON*
 
 TEST(util, Create)
 {