diff --git a/plugins/pvio/pvio_socket.c b/plugins/pvio/pvio_socket.c
index cf0b5f80..640f0c9f 100644
--- a/plugins/pvio/pvio_socket.c
+++ b/plugins/pvio/pvio_socket.c
@@ -375,7 +375,7 @@ static ssize_t ma_recv(my_socket socket, uchar *buffer, size_t length, int flags
 {
   ssize_t r;
   do {
-   r = recv(socket, (const char *)buffer, IF_WIN((int)length, length), flags);
+   r = recv(socket, (char*) buffer, IF_WIN((int)length, length), flags);
   }
   while (r == -1 && IS_SOCKET_EINTR(socket_errno));
   return r;
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 09329dab..019fc62e 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -981,8 +981,13 @@ static int test_sess_track_db(MYSQL *mysql)
   return OK;
 }
 
+
 static int test_unix_socket_close(MYSQL *unused __attribute__((unused)))
 {
+#ifdef _WIN32
+  diag("test does not run on Windows");
+  return SKIP;
+#else
   MYSQL *mysql= mysql_init(NULL);
   FILE *fp;
   int i;
@@ -1007,8 +1012,10 @@ static int test_unix_socket_close(MYSQL *unused __attribute__((unused)))
   }
   mysql_close(mysql);
   return OK;
+#endif
 }
 
+
 static int test_reset(MYSQL *mysql)
 {
   int rc;