diff --git a/tests/src/integration/ccm/tsocket.cpp b/tests/src/integration/ccm/tsocket.cpp
index b61e0045f..6bd29618c 100644
--- a/tests/src/integration/ccm/tsocket.cpp
+++ b/tests/src/integration/ccm/tsocket.cpp
@@ -18,7 +18,9 @@
 
 #include <sstream>
 
-#ifndef _WIN32
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else
 #include <arpa/inet.h>
 #include <cstring>
 #include <errno.h>
@@ -125,7 +127,7 @@ void Socket::establish_connection(const std::string& ip_address, unsigned short
   struct sockaddr_in ipv4_socket_address;
   ipv4_socket_address.sin_family = AF_INET;
   ipv4_socket_address.sin_port = htons(port);
-  ipv4_socket_address.sin_addr.s_addr = inet_addr(ip_address.c_str());
+  inet_pton(AF_INET, ip_address.c_str(), &ipv4_socket_address.sin_addr.s_addr);
   if (connect(handle_, (struct sockaddr*)(&ipv4_socket_address), sizeof(struct sockaddr_in)) != 0) {
     std::string message = "Failed to Establish Connection: ";
 #ifdef _WIN32
diff --git a/tests/src/integration/objects/retry_policy.cpp b/tests/src/integration/objects/retry_policy.cpp
index cde330172..58b76cfa9 100644
--- a/tests/src/integration/objects/retry_policy.cpp
+++ b/tests/src/integration/objects/retry_policy.cpp
@@ -16,6 +16,10 @@
 
 #include "retry_policy.hpp"
 
+#if defined(_MSC_VER)
+#pragma warning(disable : 4996)
+#endif
+
 using namespace test::driver;
 
 DowngradingConsistencyRetryPolicy::DowngradingConsistencyRetryPolicy()
diff --git a/tests/src/unit/tests/test_serialization.cpp b/tests/src/unit/tests/test_serialization.cpp
index baac718bb..d4c0be12d 100644
--- a/tests/src/unit/tests/test_serialization.cpp
+++ b/tests/src/unit/tests/test_serialization.cpp
@@ -21,7 +21,7 @@
 
 using namespace datastax::internal;
 
-TEST(SerializationTest, DecodeZigZag) { ASSERT_EQ(1LL << 63, decode_zig_zag((long)-1)); }
+TEST(SerializationTest, DecodeZigZag) { ASSERT_EQ(1LL << 63, decode_zig_zag((uint64_t)-1)); }
 
 TEST(SerializationTest, DecodeByte) {
   const signed char input[2] = { -1, 0 };