diff --git a/UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp b/UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp
index d6f1e79c328..24ef0176620 100644
--- a/UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp
+++ b/UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp
@@ -570,15 +570,15 @@ TEST_F(TestATHandler, test_ATHandler_read_bytes)
     mbed_poll_stub::int_value = 1;;
 
     // Read 5 bytes
-    EXPECT_TRUE(5 == at.read_bytes(buf, 5));
+    EXPECT_EQ(5, at.read_bytes(buf, 5));
     EXPECT_TRUE(!memcmp(buf, table1, 5));
     // get_char triggered above should have filled in the whole reading buffer(fill_buffer())
-    EXPECT_TRUE(filehandle_stub_table_pos == (strlen(table1) - 1));
+    EXPECT_EQ(filehandle_stub_table_pos, (strlen(table1)));
     // Read another 8 bytes
     EXPECT_TRUE(8 == at.read_bytes(buf, 8) && !memcmp(buf, table1 + 5, 8));
     // Reading more than the 4 bytes left -> ERROR
-    EXPECT_TRUE(-1 == at.read_bytes(buf, 5));
-    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == at.get_last_error());
+    EXPECT_EQ(-1, at.read_bytes(buf, 5));
+    EXPECT_EQ(NSAPI_ERROR_DEVICE_ERROR, at.get_last_error());
 }
 
 TEST_F(TestATHandler, test_ATHandler_read_string)
diff --git a/features/cellular/framework/AT/ATHandler.h b/features/cellular/framework/AT/ATHandler.h
index c05c581c0c5..e019efa482f 100644
--- a/features/cellular/framework/AT/ATHandler.h
+++ b/features/cellular/framework/AT/ATHandler.h
@@ -43,7 +43,7 @@ class FileHandle;
 extern const char *OK;
 extern const char *CRLF;
 
-#define BUFF_SIZE 16
+#define BUFF_SIZE 32
 
 /* AT Error types enumeration */
 enum DeviceErrorType {