diff --git a/src/base/socket.test.cc b/src/base/socket.test.cc
index 7372911133..c08adc2678 100644
--- a/src/base/socket.test.cc
+++ b/src/base/socket.test.cc
@@ -31,8 +31,8 @@
 #include "base/gtest/logging.hh"
 #include "base/socket.hh"
 
-#define TEST_PORT_1 7893
-#define TEST_PORT_2 7894
+static const int TestPort1 = 7893;
+static const int TestPort2 = 7894;
 
 /*
  * Socket.test tests socket.cc. It should be noted that some features of
@@ -77,7 +77,7 @@ TEST(SocketTest, DisableAll)
 TEST(SocketTest, ListenToPort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));
     EXPECT_NE(-1, listen_socket.getfd());
     EXPECT_TRUE(listen_socket.islistening());
     EXPECT_FALSE(listen_socket.allDisabled());
@@ -90,7 +90,7 @@ TEST(SocketTest, ListenToPortReuseFalse)
      * The ListenSocket object should have the same state regardless as to
      * whether reuse is true or false (it is true by default).
      */
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1, false));
+    EXPECT_TRUE(listen_socket.listen(TestPort1, false));
     EXPECT_NE(-1, listen_socket.getfd());
     EXPECT_TRUE(listen_socket.islistening());
     EXPECT_FALSE(listen_socket.allDisabled());
@@ -99,13 +99,13 @@ TEST(SocketTest, ListenToPortReuseFalse)
 TEST(SocketTest, RelistenWithSameInstanceSamePort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));
 
     /*
      * You cannot listen to another port if you are already listening to one.
      */
     gtestLogOutput.str("");
-    EXPECT_ANY_THROW(listen_socket.listen(TEST_PORT_1));
+    EXPECT_ANY_THROW(listen_socket.listen(TestPort1));
     std::string expected = "panic: Socket already listening!\n";
     std::string actual = gtestLogOutput.str();
     EXPECT_EQ(expected, actual);
@@ -114,13 +114,13 @@ TEST(SocketTest, RelistenWithSameInstanceSamePort)
 TEST(SocketTest, RelistenWithSameInstanceDifferentPort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));
 
     /*
      * You cannot listen to another port if you are already listening to one.
      */
     gtestLogOutput.str("");
-    EXPECT_ANY_THROW(listen_socket.listen(TEST_PORT_2));
+    EXPECT_ANY_THROW(listen_socket.listen(TestPort2));
 
     std::string expected = "panic: Socket already listening!\n";
     std::string actual = gtestLogOutput.str();
@@ -130,25 +130,25 @@ TEST(SocketTest, RelistenWithSameInstanceDifferentPort)
 TEST(SocketTest, RelistenWithDifferentInstanceOnDifferentPort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));
 
     /*
      * You can listen to another port with a different instance.
      */
     MockListenSocket listen_socket_2;
-    EXPECT_TRUE(listen_socket_2.listen(TEST_PORT_2));
+    EXPECT_TRUE(listen_socket_2.listen(TestPort2));
 }
 
 TEST(SocketTest, RelistenWithDifferentInstanceOnSamePort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));
 
     /*
      * You cannot listen to a port that's already being listened to.
      */
     MockListenSocket listen_socket_2;
-    EXPECT_FALSE(listen_socket_2.listen(TEST_PORT_1));
+    EXPECT_FALSE(listen_socket_2.listen(TestPort1));
 }
 
 TEST(SocketTest, AcceptError)