diff --git a/test/echo-server.c b/test/echo-server.c
index 058c99254..6f3e77f99 100644
--- a/test/echo-server.c
+++ b/test/echo-server.c
@@ -248,7 +248,7 @@ static void on_recv(uv_udp_t* handle,
   ASSERT(0 <= uv_udp_send(req, handle, &sndbuf, 1, addr, on_send));
 }
 
-static int tcp4_echo_start(int port) {
+static int tcp4_echo_start(unsigned short port) {
   struct sockaddr_in addr;
   int r;
 
@@ -282,7 +282,7 @@ static int tcp4_echo_start(int port) {
 }
 
 
-static int tcp6_echo_start(int port) {
+static int tcp6_echo_start(unsigned short port) {
   struct sockaddr_in6 addr6;
   int r;
 
@@ -317,7 +317,7 @@ static int tcp6_echo_start(int port) {
 }
 
 
-static int udp4_echo_start(int port) {
+static int udp4_echo_start(unsigned short port) {
   struct sockaddr_in addr;
   int r;
 
diff --git a/test/test-getnameinfo.c b/test/test-getnameinfo.c
index cea57b012..704f55d2a 100644
--- a/test/test-getnameinfo.c
+++ b/test/test-getnameinfo.c
@@ -28,7 +28,7 @@
 
 static const char* address_ip4 = "127.0.0.1";
 static const char* address_ip6 = "::1";
-static const int port = 80;
+static const unsigned short port = 80;
 
 static struct sockaddr_in addr4;
 static struct sockaddr_in6 addr6;