diff --git a/TESTS/netsocket/tcp/tcpsocket_echotest.cpp b/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
index 1d9c2e1ac8..248a380979 100644
--- a/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
@@ -86,6 +86,8 @@ void TCPSOCKET_ECHOTEST()
                 TEST_FAIL();
                 TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
                 return;
+            } else if (recvd > bytes2recv) {
+                TEST_FAIL_MESSAGE("sock.recv returned more bytes than requested");
             }
             bytes2recv -= recvd;
         }
diff --git a/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp b/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp
index 4b020f8abd..9561d8b815 100644
--- a/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp
@@ -73,6 +73,8 @@ void TCPSOCKET_ECHOTEST_BURST()
             if (recvd < 0) {
                 printf("[%02d] network error %d\n", i, recvd);
                 break;
+            } else if (recvd > bt_left) {
+                TEST_FAIL_MESSAGE("sock.recv returned more bytes than requested");
             }
             bt_left -= recvd;
         }
diff --git a/TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp b/TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp
index d8fb3ed3ad..14a42575ab 100644
--- a/TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp
@@ -145,6 +145,9 @@ void rcv_n_chk_against_rfc864_pattern_nonblock(TCPSocket &sock)
         int rd = sock.recv(buff, buff_size);
         TEST_ASSERT(rd > 0 || rd == NSAPI_ERROR_WOULD_BLOCK);
         if (rd > 0) {
+            if (rd > buff_size) {
+                TEST_FAIL_MESSAGE("sock.recv returned more than requested.");
+            }
             check_RFC_864_pattern(buff, rd, recvd_size);
             recvd_size += rd;
         } else if (rd == NSAPI_ERROR_WOULD_BLOCK) {
diff --git a/TESTS/netsocket/tls/tlssocket_echotest.cpp b/TESTS/netsocket/tls/tlssocket_echotest.cpp
index eff2cafa4f..3459af0a92 100644
--- a/TESTS/netsocket/tls/tlssocket_echotest.cpp
+++ b/TESTS/netsocket/tls/tlssocket_echotest.cpp
@@ -91,6 +91,8 @@ void TLSSOCKET_ECHOTEST()
                 TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close());
                 delete sock;
                 return;
+            }  else if (recvd > bytes2recv) {
+                TEST_FAIL_MESSAGE("sock.recv returned more bytes than requested");
             }
             bytes2recv -= recvd;
         }
diff --git a/TESTS/netsocket/tls/tlssocket_echotest_burst.cpp b/TESTS/netsocket/tls/tlssocket_echotest_burst.cpp
index f5d12ef93c..a47d89be64 100644
--- a/TESTS/netsocket/tls/tlssocket_echotest_burst.cpp
+++ b/TESTS/netsocket/tls/tlssocket_echotest_burst.cpp
@@ -75,6 +75,8 @@ void TLSSOCKET_ECHOTEST_BURST()
             if (recvd < 0) {
                 printf("[%02d] network error %d\n", i, recvd);
                 break;
+            } else if (recvd > bt_left) {
+                TEST_FAIL_MESSAGE("sock.recv returned more bytes than requested");
             }
             bt_left -= recvd;
         }