diff --git a/UNITTESTS/features/netsocket/DTLSSocket/test_DTLSSocket.cpp b/UNITTESTS/features/netsocket/DTLSSocket/test_DTLSSocket.cpp
index 273305ef11..948301cb3f 100644
--- a/UNITTESTS/features/netsocket/DTLSSocket/test_DTLSSocket.cpp
+++ b/UNITTESTS/features/netsocket/DTLSSocket/test_DTLSSocket.cpp
@@ -58,7 +58,7 @@ TEST_F(TestDTLSSocket, constructor)
 
 TEST_F(TestDTLSSocket, connect)
 {
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
 
     stack.return_value = NSAPI_ERROR_OK;
     SocketAddress a("127.0.0.1", 1024);
diff --git a/UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp b/UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp
index e63c8750c9..da8ee2efcf 100644
--- a/UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp
+++ b/UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp
@@ -111,7 +111,7 @@ TEST_F(TestDTLSSocketWrapper, constructor_hostname)
 
 TEST_F(TestDTLSSocketWrapper, connect)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     const SocketAddress a("127.0.0.1", 1024);
     stack.return_socketAddress = a;
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
@@ -129,7 +129,7 @@ TEST_F(TestDTLSSocketWrapper, connect_no_open)
 
 TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_handshake)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[1] = -1; // mbedtls_ssl_handshake error
     const SocketAddress a("127.0.0.1", 1024);
@@ -139,7 +139,7 @@ TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_handshake)
 
 TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_handshake_in_progress)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     mbedtls_stub.useCounter = true;
     wrapper->set_timeout(1);
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -151,7 +151,7 @@ TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_handshake_in_progress)
 
 TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_get_verify_result)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.uint32_value = 1; // mbedtls_ssl_get_verify_result error
     const SocketAddress a("127.0.0.1", 1024);
     stack.return_socketAddress = a;
@@ -160,7 +160,7 @@ TEST_F(TestDTLSSocketWrapper, connect_handshake_fail_ssl_get_verify_result)
 
 TEST_F(TestDTLSSocketWrapper, connect_fail_ctr_drbg_seed)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.crt_expected_int = 1; // mbedtls_ctr_drbg_seed error
     stack.return_value = NSAPI_ERROR_OK;
     const SocketAddress a("127.0.0.1", 1024);
@@ -171,7 +171,7 @@ TEST_F(TestDTLSSocketWrapper, connect_fail_ctr_drbg_seed)
 
 TEST_F(TestDTLSSocketWrapper, connect_fail_ssl_setup)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[0] = 2; // mbedtls_ssl_setup           error
     stack.return_value = NSAPI_ERROR_OK;
@@ -192,7 +192,7 @@ TEST_F(TestDTLSSocketWrapper, send_in_one_chunk)
 {
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[2] = dataSize; // mbedtls_ssl_write
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     const SocketAddress a("127.0.0.1", 1024);
     stack.return_socketAddress = a;
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
@@ -203,7 +203,7 @@ TEST_F(TestDTLSSocketWrapper, send_in_two_chunks)
 {
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[2] = dataSize; // mbedtls_ssl_write
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     const SocketAddress a("127.0.0.1", 1024);
     stack.return_socketAddress = a;
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
@@ -212,7 +212,7 @@ TEST_F(TestDTLSSocketWrapper, send_in_two_chunks)
 
 TEST_F(TestDTLSSocketWrapper, send_error_would_block)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[2] = MBEDTLS_ERR_SSL_WANT_WRITE; // mbedtls_ssl_write
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -224,7 +224,7 @@ TEST_F(TestDTLSSocketWrapper, send_error_would_block)
 
 TEST_F(TestDTLSSocketWrapper, send_to)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
 
     mbedtls_stub.retArray[2] = dataSize; // mbedtls_ssl_write
@@ -244,7 +244,7 @@ TEST_F(TestDTLSSocketWrapper, recv_no_open)
 
 TEST_F(TestDTLSSocketWrapper, recv_all_data)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[2] = dataSize; // mbedtls_ssl_write
     const SocketAddress a("127.0.0.1", 1024);
@@ -255,7 +255,7 @@ TEST_F(TestDTLSSocketWrapper, recv_all_data)
 
 TEST_F(TestDTLSSocketWrapper, recv_less_than_expected)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     unsigned int lessThanDataSize = dataSize - 1;
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[2] = lessThanDataSize; // mbedtls_ssl_write
@@ -267,7 +267,7 @@ TEST_F(TestDTLSSocketWrapper, recv_less_than_expected)
 
 TEST_F(TestDTLSSocketWrapper, recv_would_block)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[2] = MBEDTLS_ERR_SSL_WANT_WRITE; // mbedtls_ssl_write
     const SocketAddress a("127.0.0.1", 1024);
@@ -286,7 +286,7 @@ TEST_F(TestDTLSSocketWrapper, recv_from_no_socket)
 TEST_F(TestDTLSSocketWrapper, recv_from)
 {
     SocketAddress a("127.0.0.1", 1024);
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     stack.return_socketAddress = a;
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
     SocketAddress b;
@@ -296,7 +296,7 @@ TEST_F(TestDTLSSocketWrapper, recv_from)
 TEST_F(TestDTLSSocketWrapper, recv_from_null)
 {
     SocketAddress a("127.0.0.1", 1024);
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     stack.return_socketAddress = a;
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->recvfrom(NULL, dataBuf, dataSize), NSAPI_ERROR_OK);
@@ -307,20 +307,20 @@ TEST_F(TestDTLSSocketWrapper, recv_from_null)
 TEST_F(TestDTLSSocketWrapper, set_root_ca_cert)
 {
     EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK);
     EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
 }
 
 TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_nolen)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->set_root_ca_cert(cert), NSAPI_ERROR_OK);
 }
 
 TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_invalid)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.counter = 0;
     mbedtls_stub.retArray[0] = 1; // mbedtls_x509_crt_parse error
@@ -332,14 +332,14 @@ TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_invalid)
 TEST_F(TestDTLSSocketWrapper, set_client_cert_key)
 {
     EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK);
     EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
 }
 
 TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[0] = 1; // mbedtls_x509_crt_parse error
     EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_PARAMETER);
@@ -347,7 +347,7 @@ TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid)
 
 TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid_pem)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[0] = 0; // mbedtls_x509_crt_parse ok
     mbedtls_stub.retArray[1] = 1; // mbedtls_pk_parse_key error
@@ -356,7 +356,7 @@ TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid_pem)
 
 TEST_F(TestDTLSSocketWrapper, bind)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     SocketAddress a("127.0.0.1", 1024);
     EXPECT_EQ(wrapper->bind(a), NSAPI_ERROR_OK);
 }
@@ -369,7 +369,7 @@ TEST_F(TestDTLSSocketWrapper, bind_no_open)
 
 TEST_F(TestDTLSSocketWrapper, sigio)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     callback_is_called = false;
     wrapper->sigio(mbed::callback(my_callback));
     SocketAddress a("127.0.0.1", 1024);
@@ -379,7 +379,7 @@ TEST_F(TestDTLSSocketWrapper, sigio)
 
 TEST_F(TestDTLSSocketWrapper, setsockopt)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     EXPECT_EQ(wrapper->setsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
 }
 
@@ -390,7 +390,7 @@ TEST_F(TestDTLSSocketWrapper, getsockopt_no_stack)
 
 TEST_F(TestDTLSSocketWrapper, getsockopt)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     EXPECT_EQ(wrapper->getsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
 }
 
diff --git a/UNITTESTS/features/netsocket/InternetSocket/test_InternetSocket.cpp b/UNITTESTS/features/netsocket/InternetSocket/test_InternetSocket.cpp
index fbba80e793..1672e3f5b3 100644
--- a/UNITTESTS/features/netsocket/InternetSocket/test_InternetSocket.cpp
+++ b/UNITTESTS/features/netsocket/InternetSocket/test_InternetSocket.cpp
@@ -125,26 +125,26 @@ TEST_F(TestInternetSocket, open_null_stack)
 TEST_F(TestInternetSocket, open_error)
 {
     stack.return_value = NSAPI_ERROR_PARAMETER;
-    EXPECT_EQ(socket->open((NetworkStack *)&stack), NSAPI_ERROR_PARAMETER);
+    EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_PARAMETER);
 }
 
 TEST_F(TestInternetSocket, open)
 {
     stack.return_value = NSAPI_ERROR_OK;
-    EXPECT_EQ(socket->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_OK);
 }
 
 TEST_F(TestInternetSocket, open_twice)
 {
     stack.return_value = NSAPI_ERROR_OK;
-    EXPECT_EQ(socket->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
-    EXPECT_EQ(socket->open((NetworkStack *)&stack), NSAPI_ERROR_PARAMETER);
+    EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_PARAMETER);
 }
 
 TEST_F(TestInternetSocket, close)
 {
     stack.return_value = NSAPI_ERROR_OK;
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     EXPECT_EQ(socket->close(), NSAPI_ERROR_OK);
 }
 
@@ -157,7 +157,7 @@ TEST_F(TestInternetSocket, close_no_open)
 TEST_F(TestInternetSocket, close_during_read)
 {
     stack.return_value = NSAPI_ERROR_OK;
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     // Simulate the blocking behavior by adding a reader.
     socket->add_reader();
     // The reader will be removed after we attempt to close the socket.
@@ -180,7 +180,7 @@ TEST_F(TestInternetSocket, modify_multicast_group)
 {
     SocketAddress a("127.0.0.1", 1024);
     stack.return_value = NSAPI_ERROR_OK;
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     EXPECT_EQ(socket->join_multicast_group(a), NSAPI_ERROR_UNSUPPORTED);
     EXPECT_EQ(socket->leave_multicast_group(a), NSAPI_ERROR_UNSUPPORTED);
 }
@@ -194,7 +194,7 @@ TEST_F(TestInternetSocket, bind_no_socket)
 
 TEST_F(TestInternetSocket, bind)
 {
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     SocketAddress a("127.0.0.1", 80);
     EXPECT_EQ(socket->bind(a), NSAPI_ERROR_OK);
 }
@@ -208,7 +208,7 @@ TEST_F(TestInternetSocket, setsockopt_no_stack)
 
 TEST_F(TestInternetSocket, setsockopt)
 {
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     EXPECT_EQ(socket->setsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
 }
 
@@ -219,14 +219,14 @@ TEST_F(TestInternetSocket, getsockopt_no_stack)
 
 TEST_F(TestInternetSocket, getsockopt)
 {
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     EXPECT_EQ(socket->getsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
 }
 
 TEST_F(TestInternetSocket, sigio)
 {
     callback_is_called = false;
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     socket->sigio(mbed::callback(my_callback));
     socket->close(); // Trigger event;
     EXPECT_EQ(callback_is_called, true);
@@ -241,7 +241,7 @@ TEST_F(TestInternetSocket, getpeername)
 
     EXPECT_EQ(socket->getpeername(&peer), NSAPI_ERROR_NO_SOCKET);
 
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     socket->connect(zero);
 
     EXPECT_EQ(socket->getpeername(&peer), NSAPI_ERROR_NO_CONNECTION);
diff --git a/UNITTESTS/features/netsocket/TCPServer/test_TCPServer.cpp b/UNITTESTS/features/netsocket/TCPServer/test_TCPServer.cpp
index d866ea0ab0..a3bcd1587b 100644
--- a/UNITTESTS/features/netsocket/TCPServer/test_TCPServer.cpp
+++ b/UNITTESTS/features/netsocket/TCPServer/test_TCPServer.cpp
@@ -54,7 +54,7 @@ TEST_F(TestTCPServer, constructor)
 
 TEST_F(TestTCPServer, constructor_parameters)
 {
-    TCPServer serverParam = TCPServer(dynamic_cast<NetworkStack *>(&stack));
+    TCPServer serverParam = TCPServer(&stack);
     const SocketAddress a("127.0.0.1", 1024);
     EXPECT_EQ(serverParam.connect(a), NSAPI_ERROR_OK);
 }
@@ -62,10 +62,10 @@ TEST_F(TestTCPServer, constructor_parameters)
 TEST_F(TestTCPServer, accept)
 {
     const SocketAddress a("127.0.0.1", 1024);
-    EXPECT_EQ(socket->open(static_cast<NetworkStack *>(&stack)), NSAPI_ERROR_OK);
+    EXPECT_EQ(socket->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(socket->connect(a), NSAPI_ERROR_OK);
     nsapi_error_t error;
-    EXPECT_EQ(server->open(static_cast<NetworkStack *>(&stack)), NSAPI_ERROR_OK);
+    EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(server->bind(a), NSAPI_ERROR_OK);
     server->listen(1);
     SocketAddress client_addr;
@@ -81,7 +81,7 @@ TEST_F(TestTCPServer, accept_no_socket)
 TEST_F(TestTCPServer, accept_error)
 {
     SocketAddress client_addr;
-    EXPECT_EQ(server->open(static_cast<NetworkStack *>(&stack)), NSAPI_ERROR_OK);
+    EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
     stack.return_value = NSAPI_ERROR_AUTH_FAILURE;
     EXPECT_EQ(server->accept(socket, &client_addr), NSAPI_ERROR_AUTH_FAILURE);
 }
@@ -89,7 +89,7 @@ TEST_F(TestTCPServer, accept_error)
 TEST_F(TestTCPServer, accept_error_would_block)
 {
     SocketAddress client_addr;
-    EXPECT_EQ(server->open(static_cast<NetworkStack *>(&stack)), NSAPI_ERROR_OK);
+    EXPECT_EQ(server->open(&stack), NSAPI_ERROR_OK);
     stack.return_value = NSAPI_ERROR_WOULD_BLOCK;
     eventFlagsStubNextRetval.push_back(0);
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
diff --git a/UNITTESTS/features/netsocket/TLSSocket/test_TLSSocket.cpp b/UNITTESTS/features/netsocket/TLSSocket/test_TLSSocket.cpp
index 943e3eea0f..585ef2ac77 100644
--- a/UNITTESTS/features/netsocket/TLSSocket/test_TLSSocket.cpp
+++ b/UNITTESTS/features/netsocket/TLSSocket/test_TLSSocket.cpp
@@ -58,7 +58,7 @@ TEST_F(TestTLSSocket, constructor)
 
 TEST_F(TestTLSSocket, connect)
 {
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
 
     stack.return_value = NSAPI_ERROR_OK;
     SocketAddress a("127.0.0.1", 1024);
diff --git a/UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp b/UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp
index 740d6eba9a..0f20e6ea29 100644
--- a/UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp
+++ b/UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp
@@ -123,7 +123,7 @@ TEST_F(TestTLSSocketWrapper, no_socket)
 
 TEST_F(TestTLSSocketWrapper, connect)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     const SocketAddress a("127.0.0.1", 1024);
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_IS_CONNECTED);
@@ -140,7 +140,7 @@ TEST_F(TestTLSSocketWrapper, connect_no_open)
 
 TEST_F(TestTLSSocketWrapper, connect_error_in_progress_no_timeout)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     stack.return_value = NSAPI_ERROR_IN_PROGRESS;
     const SocketAddress a("127.0.0.1", 1024);
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -149,7 +149,7 @@ TEST_F(TestTLSSocketWrapper, connect_error_in_progress_no_timeout)
 
 TEST_F(TestTLSSocketWrapper, connect_with_timeout)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     stack.return_value = NSAPI_ERROR_IN_PROGRESS;
     const SocketAddress a("127.0.0.1", 1024);
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -159,7 +159,7 @@ TEST_F(TestTLSSocketWrapper, connect_with_timeout)
 
 TEST_F(TestTLSSocketWrapper, connect_error_is_connected)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     const SocketAddress a("127.0.0.1", 1024);
     wrapper->set_timeout(1);
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
@@ -171,7 +171,7 @@ TEST_F(TestTLSSocketWrapper, connect_error_is_connected)
 
 TEST_F(TestTLSSocketWrapper, connect_fail_ctr_drbg_seed)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.crt_expected_int = 1; // mbedtls_ctr_drbg_seed error
     stack.return_value = NSAPI_ERROR_OK;
     const SocketAddress a("127.0.0.1", 1024);
@@ -181,7 +181,7 @@ TEST_F(TestTLSSocketWrapper, connect_fail_ctr_drbg_seed)
 
 TEST_F(TestTLSSocketWrapper, connect_fail_ssl_setup)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[0] = 0; // mbedtls_ssl_config_defaults ok
     mbedtls_stub.retArray[1] = 2; // mbedtls_ssl_setup           error
@@ -192,7 +192,7 @@ TEST_F(TestTLSSocketWrapper, connect_fail_ssl_setup)
 
 TEST_F(TestTLSSocketWrapper, connect_handshake_fail_ssl_handshake)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[2] = -1; // mbedtls_ssl_handshake error
     const SocketAddress a("127.0.0.1", 1024);
@@ -201,7 +201,7 @@ TEST_F(TestTLSSocketWrapper, connect_handshake_fail_ssl_handshake)
 
 TEST_F(TestTLSSocketWrapper, connect_handshake_fail_ssl_handshake_in_progress)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     wrapper->set_timeout(1);
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -222,7 +222,7 @@ TEST_F(TestTLSSocketWrapper, connect_handshake_fail_ssl_handshake_in_progress)
 
 TEST_F(TestTLSSocketWrapper, connect_handshake_fail_ssl_get_verify_result)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.uint32_value = 1; // mbedtls_ssl_get_verify_result error
     const SocketAddress a("127.0.0.1", 1024);
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
@@ -240,7 +240,7 @@ TEST_F(TestTLSSocketWrapper, send_in_one_chunk)
 {
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = dataSize; // mbedtls_ssl_write
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     const SocketAddress a("127.0.0.1", 1024);
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->send(dataBuf, dataSize), dataSize);
@@ -250,7 +250,7 @@ TEST_F(TestTLSSocketWrapper, send_in_two_chunks)
 {
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = dataSize; // mbedtls_ssl_write
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     const SocketAddress a("127.0.0.1", 1024);
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->send(dataBuf, dataSize), dataSize);
@@ -258,7 +258,7 @@ TEST_F(TestTLSSocketWrapper, send_in_two_chunks)
 
 TEST_F(TestTLSSocketWrapper, send_error_would_block)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = MBEDTLS_ERR_SSL_WANT_WRITE; // mbedtls_ssl_write
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -269,7 +269,7 @@ TEST_F(TestTLSSocketWrapper, send_error_would_block)
 
 TEST_F(TestTLSSocketWrapper, send_device_error)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE; // mbedtls_ssl_write
     eventFlagsStubNextRetval.push_back(osFlagsError); // Break the wait loop
@@ -280,7 +280,7 @@ TEST_F(TestTLSSocketWrapper, send_device_error)
 
 TEST_F(TestTLSSocketWrapper, send_to)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
 
     mbedtls_stub.retArray[3] = dataSize; // mbedtls_ssl_write
@@ -299,7 +299,7 @@ TEST_F(TestTLSSocketWrapper, recv_no_open)
 
 TEST_F(TestTLSSocketWrapper, recv_all_data)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = dataSize; // mbedtls_ssl_read
     const SocketAddress a("127.0.0.1", 1024);
@@ -309,7 +309,7 @@ TEST_F(TestTLSSocketWrapper, recv_all_data)
 
 TEST_F(TestTLSSocketWrapper, recv_less_than_expected)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     unsigned int lessThanDataSize = dataSize - 1;
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = lessThanDataSize; // mbedtls_ssl_read
@@ -320,7 +320,7 @@ TEST_F(TestTLSSocketWrapper, recv_less_than_expected)
 
 TEST_F(TestTLSSocketWrapper, recv_would_block)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = MBEDTLS_ERR_SSL_WANT_WRITE; // mbedtls_ssl_read
     const SocketAddress a("127.0.0.1", 1024);
@@ -331,7 +331,7 @@ TEST_F(TestTLSSocketWrapper, recv_would_block)
 
 TEST_F(TestTLSSocketWrapper, recv_device_error)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE; // mbedtls_ssl_read
     const SocketAddress a("127.0.0.1", 1024);
@@ -342,7 +342,7 @@ TEST_F(TestTLSSocketWrapper, recv_device_error)
 
 TEST_F(TestTLSSocketWrapper, recv_peer_clode_notify)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[3] = MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY; // mbedtls_ssl_read
     const SocketAddress a("127.0.0.1", 1024);
@@ -360,7 +360,7 @@ TEST_F(TestTLSSocketWrapper, recv_from_no_socket)
 TEST_F(TestTLSSocketWrapper, recv_from)
 {
     SocketAddress a("127.0.0.1", 1024);
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
     SocketAddress b;
     EXPECT_EQ(wrapper->recvfrom(&b, dataBuf, dataSize), NSAPI_ERROR_OK);
@@ -370,7 +370,7 @@ TEST_F(TestTLSSocketWrapper, recv_from)
 TEST_F(TestTLSSocketWrapper, recv_from_null)
 {
     SocketAddress a("127.0.0.1", 1024);
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->connect(a), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->recvfrom(NULL, dataBuf, dataSize), NSAPI_ERROR_OK);
 }
@@ -380,20 +380,20 @@ TEST_F(TestTLSSocketWrapper, recv_from_null)
 TEST_F(TestTLSSocketWrapper, set_root_ca_cert)
 {
     EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK);
     EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
 }
 
 TEST_F(TestTLSSocketWrapper, set_root_ca_cert_nolen)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->set_root_ca_cert(cert), NSAPI_ERROR_OK);
 }
 
 TEST_F(TestTLSSocketWrapper, set_root_ca_cert_invalid)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[0] = 1; // mbedtls_x509_crt_parse error
     EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_PARAMETER);
@@ -402,14 +402,14 @@ TEST_F(TestTLSSocketWrapper, set_root_ca_cert_invalid)
 TEST_F(TestTLSSocketWrapper, set_client_cert_key)
 {
     EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK);
     EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
 }
 
 TEST_F(TestTLSSocketWrapper, set_client_cert_key_invalid)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[0] = 1; // mbedtls_x509_crt_parse error
     EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_PARAMETER);
@@ -417,7 +417,7 @@ TEST_F(TestTLSSocketWrapper, set_client_cert_key_invalid)
 
 TEST_F(TestTLSSocketWrapper, set_client_cert_key_invalid_pem)
 {
-    EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
+    EXPECT_EQ(transport->open(&stack), NSAPI_ERROR_OK);
     mbedtls_stub.useCounter = true;
     mbedtls_stub.retArray[0] = 0; // mbedtls_x509_crt_parse ok
     mbedtls_stub.retArray[1] = 1; // mbedtls_pk_parse_key error
@@ -426,7 +426,7 @@ TEST_F(TestTLSSocketWrapper, set_client_cert_key_invalid_pem)
 
 TEST_F(TestTLSSocketWrapper, bind)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     SocketAddress a("127.0.0.1", 1024);
     EXPECT_EQ(wrapper->bind(a), NSAPI_ERROR_OK);
 }
@@ -439,7 +439,7 @@ TEST_F(TestTLSSocketWrapper, bind_no_open)
 
 TEST_F(TestTLSSocketWrapper, sigio)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     callback_is_called = false;
     wrapper->sigio(mbed::callback(my_callback));
     SocketAddress a("127.0.0.1", 1024);
@@ -449,7 +449,7 @@ TEST_F(TestTLSSocketWrapper, sigio)
 
 TEST_F(TestTLSSocketWrapper, setsockopt)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     EXPECT_EQ(wrapper->setsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
 }
 
@@ -460,7 +460,7 @@ TEST_F(TestTLSSocketWrapper, getsockopt_no_stack)
 
 TEST_F(TestTLSSocketWrapper, getsockopt)
 {
-    transport->open((NetworkStack *)&stack);
+    transport->open(&stack);
     EXPECT_EQ(wrapper->getsockopt(0, 0, 0, 0), NSAPI_ERROR_UNSUPPORTED);
 }
 
diff --git a/UNITTESTS/features/netsocket/UDPSocket/test_UDPSocket.cpp b/UNITTESTS/features/netsocket/UDPSocket/test_UDPSocket.cpp
index a082cf9f4e..d508955a14 100644
--- a/UNITTESTS/features/netsocket/UDPSocket/test_UDPSocket.cpp
+++ b/UNITTESTS/features/netsocket/UDPSocket/test_UDPSocket.cpp
@@ -67,7 +67,7 @@ TEST_F(TestUDPSocket, sendto_addr_port)
     const SocketAddress a("127.0.0.1", 1024);
     EXPECT_EQ(socket->sendto(a, 0, 0), NSAPI_ERROR_NO_SOCKET);
 
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
 
     stack.return_value = NSAPI_ERROR_PARAMETER;
     EXPECT_EQ(socket->sendto(a, 0, 0), NSAPI_ERROR_PARAMETER);
@@ -85,7 +85,7 @@ TEST_F(TestUDPSocket, connect)
     const nsapi_addr_t addr = {NSAPI_IPv4, {127, 0, 0, 1} };
     const SocketAddress a(addr, 1024);
 
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     EXPECT_EQ(socket->send(dataBuf, dataSize), NSAPI_ERROR_NO_ADDRESS);
 
     EXPECT_EQ(socket->connect(a), NSAPI_ERROR_OK);
@@ -99,7 +99,7 @@ TEST_F(TestUDPSocket, sendto_timeout)
     const nsapi_addr_t saddr = {NSAPI_IPv4, {127, 0, 0, 1} };
     const SocketAddress addr(saddr, 1024);
 
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
 
     stack.return_value = NSAPI_ERROR_WOULD_BLOCK;
     eventFlagsStubNextRetval.push_back(0);
@@ -116,7 +116,7 @@ TEST_F(TestUDPSocket, recv)
 {
     EXPECT_EQ(socket->recv(&dataBuf, dataSize), NSAPI_ERROR_NO_SOCKET);
 
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
 
     stack.return_value = 100;
     EXPECT_EQ(socket->recv(&dataBuf, dataSize), 100);
@@ -129,7 +129,7 @@ TEST_F(TestUDPSocket, recv)
 
 TEST_F(TestUDPSocket, recv_address_filtering)
 {
-    socket->open((NetworkStack *)&stack);
+    socket->open(&stack);
     const nsapi_addr_t addr1 = {NSAPI_IPv4, {127, 0, 0, 1} };
     const nsapi_addr_t addr2 = {NSAPI_IPv4, {127, 0, 0, 2} };
     SocketAddress a1(addr1, 1024);
diff --git a/UNITTESTS/stubs/NetworkStack_stub.cpp b/UNITTESTS/stubs/NetworkStack_stub.cpp
index 976d929d90..76ad5175a4 100644
--- a/UNITTESTS/stubs/NetworkStack_stub.cpp
+++ b/UNITTESTS/stubs/NetworkStack_stub.cpp
@@ -65,7 +65,7 @@ nsapi_error_t NetworkStack::getsockopt(void *handle, int level, int optname, voi
 // Conversion function for network stacks
 NetworkStack *nsapi_create_stack(nsapi_stack_t *stack)
 {
-    return reinterpret_cast<NetworkStack *>(stack);
+    return nullptr;
 }
 
 nsapi_value_or_error_t NetworkStack::gethostbyname_async(const char *host, hostbyname_cb_t callback, nsapi_version_t version,