diff --git a/driver-core/src/main/com/mongodb/ServerAddress.java b/driver-core/src/main/com/mongodb/ServerAddress.java
index 3a7265c51e2..cb9ec61bd51 100644
--- a/driver-core/src/main/com/mongodb/ServerAddress.java
+++ b/driver-core/src/main/com/mongodb/ServerAddress.java
@@ -188,7 +188,9 @@ public int getPort() {
      * Gets the underlying socket address
      *
      * @return socket address
+     * @deprecated Prefer {@link InetAddress#getByName(String)}
      */
+    @Deprecated
     public InetSocketAddress getSocketAddress() {
         try {
             return new InetSocketAddress(InetAddress.getByName(host), port);
@@ -203,7 +205,9 @@ public InetSocketAddress getSocketAddress() {
      * @return array of socket addresses
      *
      * @since 3.9
+     * @deprecated Prefer {@link InetAddress#getAllByName(String)}
      */
+    @Deprecated
     public List<InetSocketAddress> getSocketAddresses() {
         try {
             InetAddress[] inetAddresses = InetAddress.getAllByName(host);
diff --git a/driver-core/src/main/com/mongodb/UnixServerAddress.java b/driver-core/src/main/com/mongodb/UnixServerAddress.java
index d5c1b4c4c84..9f003a6cd48 100644
--- a/driver-core/src/main/com/mongodb/UnixServerAddress.java
+++ b/driver-core/src/main/com/mongodb/UnixServerAddress.java
@@ -44,6 +44,8 @@ public UnixServerAddress(final String path) {
         isTrueArgument("The path must end in .sock", path.endsWith(".sock"));
     }
 
+    @SuppressWarnings("deprecation")
+    @Deprecated
     @Override
     public InetSocketAddress getSocketAddress() {
         throw new UnsupportedOperationException("Cannot return a InetSocketAddress from a UnixServerAddress");
@@ -51,7 +53,9 @@ public InetSocketAddress getSocketAddress() {
 
     /**
      * @return the SocketAddress for the MongoD unix domain socket.
+     * @deprecated Prefer {@link UnixSocketAddress#UnixSocketAddress(String)}
      */
+    @Deprecated
     public SocketAddress getUnixSocketAddress() {
         return new UnixSocketAddress(getHost());
     }
diff --git a/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java b/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java
index 211f54353a4..37436d55f57 100644
--- a/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java
@@ -197,6 +197,7 @@ public boolean supportsAdditionalTimeout() {
             return true;
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void openAsync(final AsyncCompletionHandler<Void> handler) {
             isTrue("unopened", getChannel() == null);
diff --git a/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java b/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
index 54a35f1f468..4ec395fbf7b 100644
--- a/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
+++ b/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
@@ -160,6 +160,7 @@ public void open() throws IOException {
         handler.get();
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void openAsync(final AsyncCompletionHandler<Void> handler) {
         Queue<SocketAddress> socketAddressQueue;
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStream.java b/driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStream.java
index 8226072e39b..6a956247ed3 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStream.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStream.java
@@ -54,6 +54,7 @@ public AsynchronousSocketChannelStream(final ServerAddress serverAddress, final
         this.group = group;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void openAsync(final AsyncCompletionHandler<Void> handler) {
         isTrue("unopened", getChannel() == null);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ServerAddressWithResolver.java b/driver-core/src/main/com/mongodb/internal/connection/ServerAddressWithResolver.java
index bcde93d4cf8..e86d1fca189 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/ServerAddressWithResolver.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ServerAddressWithResolver.java
@@ -51,6 +51,7 @@ final class ServerAddressWithResolver extends ServerAddress {
         this.resolver = inetAddressResolver == null ? DEFAULT_INET_ADDRESS_RESOLVER : inetAddressResolver;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public InetSocketAddress getSocketAddress() {
         if (resolver == null) {
@@ -60,6 +61,7 @@ public InetSocketAddress getSocketAddress() {
         return getSocketAddresses().get(0);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public List<InetSocketAddress> getSocketAddresses() {
         if (resolver == null) {
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SocketStream.java b/driver-core/src/main/com/mongodb/internal/connection/SocketStream.java
index 7360ce5f57b..bdbbe6d87e2 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/SocketStream.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SocketStream.java
@@ -74,6 +74,7 @@ public void open() {
         }
     }
 
+    @SuppressWarnings("deprecation")
     protected Socket initializeSocket() throws IOException {
         Iterator<InetSocketAddress> inetSocketAddresses = address.getSocketAddresses().iterator();
         while (inetSocketAddresses.hasNext()) {
diff --git a/driver-core/src/main/com/mongodb/internal/connection/UnixSocketChannelStream.java b/driver-core/src/main/com/mongodb/internal/connection/UnixSocketChannelStream.java
index 7400a02d7b6..b56887c0fbc 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/UnixSocketChannelStream.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/UnixSocketChannelStream.java
@@ -39,6 +39,7 @@ public UnixSocketChannelStream(final UnixServerAddress address, final SocketSett
         this.address = address;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     protected Socket initializeSocket() throws IOException {
         return UnixSocketChannel.open((UnixSocketAddress) address.getUnixSocketAddress()).socket();