diff --git a/test/uri_options/auth-options.json b/test/uri_options/auth-options.json
index fadbac35d2..d7fa14a134 100644
--- a/test/uri_options/auth-options.json
+++ b/test/uri_options/auth-options.json
@@ -2,7 +2,7 @@
   "tests": [
     {
       "description": "Valid auth options are parsed correctly (GSSAPI)",
-      "uri": "mongodb://foo:bar@example.com/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true&authSource=$external",
+      "uri": "mongodb://foo:bar@example.com/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:forward,SERVICE_HOST:example.com&authSource=$external",
       "valid": true,
       "warning": false,
       "hosts": null,
@@ -11,7 +11,8 @@
         "authMechanism": "GSSAPI",
         "authMechanismProperties": {
           "SERVICE_NAME": "other",
-          "CANONICALIZE_HOST_NAME": true
+          "SERVICE_HOST": "example.com",
+          "CANONICALIZE_HOST_NAME": "forward"
         },
         "authSource": "$external"
       }
diff --git a/test/uri_options/compression-options.json b/test/uri_options/compression-options.json
index 16bd27b2cc..3c13dee062 100644
--- a/test/uri_options/compression-options.json
+++ b/test/uri_options/compression-options.json
@@ -35,7 +35,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low zlibCompressionLevel causes a warning",
@@ -44,7 +44,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too high zlibCompressionLevel causes a warning",
@@ -53,7 +53,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     }
   ]
 }
diff --git a/test/uri_options/concern-options.json b/test/uri_options/concern-options.json
index 5a8ef6c272..f55f298087 100644
--- a/test/uri_options/concern-options.json
+++ b/test/uri_options/concern-options.json
@@ -43,7 +43,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low wTimeoutMS causes a warning",
@@ -52,7 +52,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Invalid journal causes a warning",
@@ -61,7 +61,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     }
   ]
 }
diff --git a/test/uri_options/connection-options.json b/test/uri_options/connection-options.json
index b2669b6cf1..bbaa295ecb 100644
--- a/test/uri_options/connection-options.json
+++ b/test/uri_options/connection-options.json
@@ -27,7 +27,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low connectTimeoutMS causes a warning",
@@ -36,7 +36,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Non-numeric heartbeatFrequencyMS causes a warning",
@@ -45,7 +45,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low heartbeatFrequencyMS causes a warning",
@@ -54,7 +54,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Non-numeric localThresholdMS causes a warning",
@@ -63,7 +63,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low localThresholdMS causes a warning",
@@ -72,7 +72,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Invalid retryWrites causes a warning",
@@ -81,7 +81,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Non-numeric serverSelectionTimeoutMS causes a warning",
@@ -90,7 +90,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low serverSelectionTimeoutMS causes a warning",
@@ -99,7 +99,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Non-numeric socketTimeoutMS causes a warning",
@@ -108,7 +108,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low socketTimeoutMS causes a warning",
@@ -117,7 +117,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "directConnection=true",
@@ -137,7 +137,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "directConnection=false",
@@ -168,7 +168,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "loadBalanced=true",
@@ -211,7 +211,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "loadBalanced=true with multiple hosts causes an error",
@@ -220,7 +220,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "loadBalanced=true with directConnection=true causes an error",
@@ -229,7 +229,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "loadBalanced=true with replicaSet causes an error",
@@ -238,7 +238,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "timeoutMS=0",
@@ -258,7 +258,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low timeoutMS causes a warning",
@@ -267,7 +267,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     }
   ]
 }
diff --git a/test/uri_options/connection-pool-options.json b/test/uri_options/connection-pool-options.json
index 118b2f6783..a582867d07 100644
--- a/test/uri_options/connection-pool-options.json
+++ b/test/uri_options/connection-pool-options.json
@@ -21,7 +21,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Too low maxIdleTimeMS causes a warning",
@@ -30,7 +30,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "maxPoolSize=0 does not error",
@@ -61,7 +61,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "maxConnecting<0 causes a warning",
@@ -70,7 +70,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     }
   ]
 }
diff --git a/test/uri_options/sdam-options.json b/test/uri_options/sdam-options.json
index 673f5607ee..ae0aeb2821 100644
--- a/test/uri_options/sdam-options.json
+++ b/test/uri_options/sdam-options.json
@@ -40,7 +40,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     }
   ]
 }
diff --git a/test/uri_options/single-threaded-options.json b/test/uri_options/single-threaded-options.json
index fcd24fb880..80ac3fa4ee 100644
--- a/test/uri_options/single-threaded-options.json
+++ b/test/uri_options/single-threaded-options.json
@@ -18,7 +18,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     }
   ]
 }
diff --git a/test/uri_options/srv-options.json b/test/uri_options/srv-options.json
index ffc356f12f..0670612c0d 100644
--- a/test/uri_options/srv-options.json
+++ b/test/uri_options/srv-options.json
@@ -18,7 +18,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "SRV URI with srvMaxHosts",
@@ -38,7 +38,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "SRV URI with invalid type for srvMaxHosts",
@@ -47,7 +47,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "Non-SRV URI with srvMaxHosts",
@@ -56,7 +56,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "SRV URI with positive srvMaxHosts and replicaSet",
@@ -65,7 +65,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "SRV URI with positive srvMaxHosts and loadBalanced=true",
@@ -74,7 +74,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "SRV URI with positive srvMaxHosts and loadBalanced=false",
diff --git a/test/uri_options/tls-options.json b/test/uri_options/tls-options.json
index 8beaaddd86..526cde1cbe 100644
--- a/test/uri_options/tls-options.json
+++ b/test/uri_options/tls-options.json
@@ -31,7 +31,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates is parsed correctly",
@@ -62,7 +62,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure is parsed correctly",
@@ -82,7 +82,7 @@
       "warning": true,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure and tlsAllowInvalidCertificates both present (and true) raises an error",
@@ -91,7 +91,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure and tlsAllowInvalidCertificates both present (and false) raises an error",
@@ -100,7 +100,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates and tlsInsecure both present (and true) raises an error",
@@ -109,7 +109,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates and tlsInsecure both present (and false) raises an error",
@@ -118,7 +118,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure and tlsAllowInvalidHostnames both present (and true) raises an error",
@@ -127,7 +127,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure and tlsAllowInvalidHostnames both present (and false) raises an error",
@@ -136,7 +136,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidHostnames and tlsInsecure both present (and true) raises an error",
@@ -145,7 +145,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidHostnames and tlsInsecure both present (and false) raises an error",
@@ -154,7 +154,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tls=true and ssl=true doesn't warn",
@@ -199,7 +199,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tls=true and ssl=false raises error",
@@ -208,7 +208,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "ssl=false and tls=true raises error",
@@ -217,7 +217,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "ssl=true and tls=false raises error",
@@ -226,7 +226,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck can be set to true",
@@ -259,7 +259,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates=true and tlsDisableCertificateRevocationCheck=false raises an error",
@@ -268,7 +268,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates=false and tlsDisableCertificateRevocationCheck=true raises an error",
@@ -277,7 +277,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates and tlsDisableCertificateRevocationCheck both present (and false) raises an error",
@@ -286,7 +286,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck and tlsAllowInvalidCertificates both present (and true) raises an error",
@@ -295,7 +295,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck=true and tlsAllowInvalidCertificates=false raises an error",
@@ -304,7 +304,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck=false and tlsAllowInvalidCertificates=true raises an error",
@@ -313,7 +313,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck and tlsAllowInvalidCertificates both present (and false) raises an error",
@@ -322,7 +322,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure and tlsDisableCertificateRevocationCheck both present (and true) raises an error",
@@ -331,7 +331,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure=true and tlsDisableCertificateRevocationCheck=false raises an error",
@@ -340,7 +340,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure=false and tlsDisableCertificateRevocationCheck=true raises an error",
@@ -349,7 +349,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure and tlsDisableCertificateRevocationCheck both present (and false) raises an error",
@@ -358,7 +358,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck and tlsInsecure both present (and true) raises an error",
@@ -367,7 +367,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck=true and tlsInsecure=false raises an error",
@@ -376,7 +376,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck=false and tlsInsecure=true raises an error",
@@ -385,7 +385,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck and tlsInsecure both present (and false) raises an error",
@@ -394,7 +394,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck and tlsDisableOCSPEndpointCheck both present (and true) raises an error",
@@ -403,7 +403,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck=true and tlsDisableOCSPEndpointCheck=false raises an error",
@@ -412,7 +412,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck=false and tlsDisableOCSPEndpointCheck=true raises an error",
@@ -421,7 +421,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableCertificateRevocationCheck and tlsDisableOCSPEndpointCheck both present (and false) raises an error",
@@ -430,7 +430,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck and tlsDisableCertificateRevocationCheck both present (and true) raises an error",
@@ -439,7 +439,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck=true and tlsDisableCertificateRevocationCheck=false raises an error",
@@ -448,7 +448,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck=false and tlsDisableCertificateRevocationCheck=true raises an error",
@@ -457,7 +457,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck and tlsDisableCertificateRevocationCheck both present (and false) raises an error",
@@ -466,7 +466,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck can be set to true",
@@ -499,7 +499,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure=true and tlsDisableOCSPEndpointCheck=false raises an error",
@@ -508,7 +508,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure=false and tlsDisableOCSPEndpointCheck=true raises an error",
@@ -517,7 +517,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsInsecure and tlsDisableOCSPEndpointCheck both present (and false) raises an error",
@@ -526,7 +526,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck and tlsInsecure both present (and true) raises an error",
@@ -535,7 +535,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck=true and tlsInsecure=false raises an error",
@@ -544,7 +544,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck=false and tlsInsecure=true raises an error",
@@ -553,7 +553,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck and tlsInsecure both present (and false) raises an error",
@@ -562,7 +562,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates and tlsDisableOCSPEndpointCheck both present (and true) raises an error",
@@ -571,7 +571,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates=true and tlsDisableOCSPEndpointCheck=false raises an error",
@@ -580,7 +580,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates=false and tlsDisableOCSPEndpointCheck=true raises an error",
@@ -589,7 +589,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsAllowInvalidCertificates and tlsDisableOCSPEndpointCheck both present (and false) raises an error",
@@ -598,7 +598,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck and tlsAllowInvalidCertificates both present (and true) raises an error",
@@ -607,7 +607,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck=true and tlsAllowInvalidCertificates=false raises an error",
@@ -616,7 +616,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck=false and tlsAllowInvalidCertificates=true raises an error",
@@ -625,7 +625,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     },
     {
       "description": "tlsDisableOCSPEndpointCheck and tlsAllowInvalidCertificates both present (and false) raises an error",
@@ -634,7 +634,7 @@
       "warning": false,
       "hosts": null,
       "auth": null,
-      "options": {}
+      "options": null
     }
   ]
 }