diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoClients.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoClients.java
index e338655bf66..c34f85073ac 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoClients.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoClients.java
@@ -77,12 +77,13 @@ public static MongoClient create(final ConnectionString connectionString) {
      *
      * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
      *
-     * @param connectionString the settings
+     * @param connectionString       the settings
      * @param mongoDriverInformation any driver information to associate with the MongoClient
      * @return the client
      * @since 1.3
      */
-    public static MongoClient create(final ConnectionString connectionString, final MongoDriverInformation mongoDriverInformation) {
+    public static MongoClient create(final ConnectionString connectionString,
+            @Nullable final MongoDriverInformation mongoDriverInformation) {
         return create(MongoClientSettings.builder().applyConnectionString(connectionString).build(), mongoDriverInformation);
     }
 
@@ -102,12 +103,12 @@ public static MongoClient create(final MongoClientSettings settings) {
      *
      * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
      *
-     * @param settings the settings
+     * @param settings               the settings
      * @param mongoDriverInformation any driver information to associate with the MongoClient
      * @return the client
      * @since 1.8
      */
-    public static MongoClient create(final MongoClientSettings settings, final MongoDriverInformation mongoDriverInformation) {
+    public static MongoClient create(final MongoClientSettings settings, @Nullable final MongoDriverInformation mongoDriverInformation) {
         if (settings.getStreamFactoryFactory() == null) {
             if (settings.getSslSettings().isEnabled()) {
                 return createWithTlsChannel(settings, mongoDriverInformation);
@@ -151,7 +152,7 @@ private static Cluster createCluster(final MongoClientSettings settings,
                 settings.getCompressorList(), settings.getServerApi());
     }
 
-    private static MongoDriverInformation wrapMongoDriverInformation(final MongoDriverInformation mongoDriverInformation) {
+    private static MongoDriverInformation wrapMongoDriverInformation(@Nullable final MongoDriverInformation mongoDriverInformation) {
         return (mongoDriverInformation == null ? MongoDriverInformation.builder() : MongoDriverInformation.builder(mongoDriverInformation))
                 .driverName("reactive-streams").build();
     }
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/package-info.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/package-info.java
index cb7b322f1d1..bedf55f98e5 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/package-info.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/package-info.java
@@ -28,4 +28,8 @@
  * Each {@link org.reactivestreams.Subscription} to a {@link org.reactivestreams.Publisher} relates to a single MongoDB operation and its
  * {@link org.reactivestreams.Subscriber} will receive its own specific set of results.
  */
+
+@NonNullApi
 package com.mongodb.reactivestreams.client;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionAwsCredentialFromEnvironmentTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionAwsCredentialFromEnvironmentTest.java
index bf0b38aa204..4ac56e3e5f0 100644
--- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionAwsCredentialFromEnvironmentTest.java
+++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionAwsCredentialFromEnvironmentTest.java
@@ -21,21 +21,18 @@
 import com.mongodb.client.AbstractClientSideEncryptionAwsCredentialFromEnvironmentTest;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.vault.ClientEncryption;
-import com.mongodb.lang.NonNull;
 import com.mongodb.reactivestreams.client.syncadapter.SyncClientEncryption;
 import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
 import com.mongodb.reactivestreams.client.vault.ClientEncryptions;
 
 public class ClientSideEncryptionAwsCredentialFromEnvironmentTest extends AbstractClientSideEncryptionAwsCredentialFromEnvironmentTest {
     @Override
-    @NonNull
-    protected ClientEncryption createClientEncryption(@NonNull final ClientEncryptionSettings settings) {
+    protected ClientEncryption createClientEncryption(final ClientEncryptionSettings settings) {
         return new SyncClientEncryption(ClientEncryptions.create(settings));
     }
 
     @Override
-    @NonNull
-    protected MongoClient createMongoClient(@NonNull final MongoClientSettings settings) {
+    protected MongoClient createMongoClient(final MongoClientSettings settings) {
         return new SyncMongoClient(MongoClients.create(settings));
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionDeadlockTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionDeadlockTest.java
index 49290c9ef29..3fdb074058a 100644
--- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionDeadlockTest.java
+++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionDeadlockTest.java
@@ -21,13 +21,11 @@
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.AbstractClientSideEncryptionDeadlockTest;
 import com.mongodb.client.MongoClient;
-import com.mongodb.lang.NonNull;
 import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
 
 public class ClientSideEncryptionDeadlockTest extends AbstractClientSideEncryptionDeadlockTest {
     @Override
-    @NonNull
-    protected MongoClient createMongoClient(@NonNull final MongoClientSettings settings) {
+    protected MongoClient createMongoClient(final MongoClientSettings settings) {
         return new SyncMongoClient(MongoClients.create(settings));
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionOnDemandGcpCredentialsTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionOnDemandGcpCredentialsTest.java
index 698db768883..5c581a5992d 100644
--- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionOnDemandGcpCredentialsTest.java
+++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionOnDemandGcpCredentialsTest.java
@@ -19,15 +19,13 @@
 import com.mongodb.ClientEncryptionSettings;
 import com.mongodb.client.AbstractClientSideEncryptionOnDemandGcpCredentialsTest;
 import com.mongodb.client.vault.ClientEncryption;
-import com.mongodb.lang.NonNull;
 import com.mongodb.reactivestreams.client.syncadapter.SyncClientEncryption;
 import com.mongodb.reactivestreams.client.vault.ClientEncryptions;
 
 public class ClientSideEncryptionOnDemandGcpCredentialsTest extends AbstractClientSideEncryptionOnDemandGcpCredentialsTest {
 
-    @NonNull
     @Override
-    public ClientEncryption getClientEncryption(@NonNull final ClientEncryptionSettings settings) {
+    public ClientEncryption getClientEncryption(final ClientEncryptionSettings settings) {
         return new SyncClientEncryption(ClientEncryptions.create(settings));
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ExplainTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ExplainTest.java
index 45fe85d704b..86c76edea88 100644
--- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ExplainTest.java
+++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ExplainTest.java
@@ -19,13 +19,11 @@
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.AbstractExplainTest;
 import com.mongodb.client.MongoClient;
-import com.mongodb.lang.NonNull;
 import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
 
 public class ExplainTest extends AbstractExplainTest {
     @Override
-    @NonNull
-    protected MongoClient createMongoClient(@NonNull final MongoClientSettings settings) {
+    protected MongoClient createMongoClient(final MongoClientSettings settings) {
         return new SyncMongoClient(MongoClients.create(settings));
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ReactiveInitialDnsSeedlistDiscoveryTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ReactiveInitialDnsSeedlistDiscoveryTest.java
index fbaf932fdda..cdc30a80cdc 100644
--- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ReactiveInitialDnsSeedlistDiscoveryTest.java
+++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ReactiveInitialDnsSeedlistDiscoveryTest.java
@@ -19,7 +19,6 @@
 import com.mongodb.MongoClientSettings;
 import com.mongodb.client.InitialDnsSeedlistDiscoveryTest;
 import com.mongodb.client.MongoClient;
-import com.mongodb.lang.NonNull;
 import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
 import org.bson.BsonDocument;
 import org.junit.runner.RunWith;
@@ -40,7 +39,7 @@ public ReactiveInitialDnsSeedlistDiscoveryTest(final String filename, final Path
     }
 
     @Override
-    public MongoClient createMongoClient(@NonNull final MongoClientSettings settings) {
+    public MongoClient createMongoClient(final MongoClientSettings settings) {
         return new SyncMongoClient(MongoClients.create(settings));
     }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionCustomEndpointTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionCustomEndpointTest.java
index 46333f5919e..6a04320c422 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionCustomEndpointTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientEncryptionCustomEndpointTest.java
@@ -22,7 +22,6 @@
 import com.mongodb.client.model.vault.EncryptOptions;
 import com.mongodb.client.vault.ClientEncryption;
 import com.mongodb.crypt.capi.MongoCryptException;
-import com.mongodb.lang.NonNull;
 import com.mongodb.lang.Nullable;
 import org.bson.BsonBinary;
 import org.bson.BsonDocument;
@@ -150,7 +149,6 @@ public void after() {
         }
     }
 
-    @NonNull
     public abstract ClientEncryption getClientEncryption(ClientEncryptionSettings settings);
 
     @Test
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionOnDemandGcpCredentialsTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionOnDemandGcpCredentialsTest.java
index 98b52c8a916..e7c14a346f9 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionOnDemandGcpCredentialsTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionOnDemandGcpCredentialsTest.java
@@ -36,7 +36,6 @@
 
 public abstract class AbstractClientSideEncryptionOnDemandGcpCredentialsTest {
 
-    @NonNull
     public abstract ClientEncryption getClientEncryption(ClientEncryptionSettings settings);
 
     private ClientEncryption clientEncryption;
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionOnDemandGcpCredentialsTest.java b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionOnDemandGcpCredentialsTest.java
index f971b934309..f4030ad0579 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionOnDemandGcpCredentialsTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionOnDemandGcpCredentialsTest.java
@@ -19,11 +19,9 @@
 import com.mongodb.ClientEncryptionSettings;
 import com.mongodb.client.vault.ClientEncryption;
 import com.mongodb.client.vault.ClientEncryptions;
-import com.mongodb.lang.NonNull;
 
 public class ClientSideEncryptionOnDemandGcpCredentialsTest extends AbstractClientSideEncryptionOnDemandGcpCredentialsTest {
 
-    @NonNull
     @Override
     public ClientEncryption getClientEncryption(final ClientEncryptionSettings settings) {
         return ClientEncryptions.create(settings);