diff --git a/test/client-side-encryption/spec/legacy/maxWireVersion.json b/test/client-side-encryption/spec/legacy/maxWireVersion.json
index c1088a0ec..f04f58dff 100644
--- a/test/client-side-encryption/spec/legacy/maxWireVersion.json
+++ b/test/client-side-encryption/spec/legacy/maxWireVersion.json
@@ -1,7 +1,7 @@
 {
   "runOn": [
     {
-      "maxServerVersion": "4.0"
+      "maxServerVersion": "4.0.99"
     }
   ],
   "database_name": "default",
diff --git a/test/test_encryption.py b/test/test_encryption.py
index 8e8814a42..567d60689 100644
--- a/test/test_encryption.py
+++ b/test/test_encryption.py
@@ -616,6 +616,8 @@ class TestSpec(SpecRunner):
             opts["kms_tls_options"] = KMS_TLS_OPTS
         if "key_vault_namespace" not in opts:
             opts["key_vault_namespace"] = "keyvault.datakeys"
+        if "extra_options" in opts:
+            opts.update(camel_to_snake_args(opts.pop("extra_options")))
 
         opts = dict(opts)
         return AutoEncryptionOpts(**opts)