diff --git a/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json b/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json
new file mode 100644
index 00000000000..b5fcfd2c07b
--- /dev/null
+++ b/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.json
@@ -0,0 +1,19 @@
+{
+  "uri": "mongodb+srv://test1.test.build.10gen.cc/some%2Cdb?replicaSet=repl0",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017",
+    "localhost.test.build.10gen.cc:27018"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  },
+  "parsed_options": {
+    "defaultDatabase": "some,db"
+  }
+}
diff --git a/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.yml b/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.yml
new file mode 100644
index 00000000000..c0719f0862f
--- /dev/null
+++ b/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas-escaped.yml
@@ -0,0 +1,13 @@
+uri: "mongodb+srv://test1.test.build.10gen.cc/some%2Cdb?replicaSet=repl0"
+seeds:
+  - localhost.test.build.10gen.cc:27017
+  - localhost.test.build.10gen.cc:27018
+hosts:
+  - localhost:27017
+  - localhost:27018
+  - localhost:27019
+options:
+  replicaSet: repl0
+  ssl: true
+parsed_options:
+  defaultDatabase: some,db
diff --git a/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json b/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json
new file mode 100644
index 00000000000..c1e85f4b99f
--- /dev/null
+++ b/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.json
@@ -0,0 +1,19 @@
+{
+  "uri": "mongodb+srv://test1.test.build.10gen.cc/some,db?replicaSet=repl0",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017",
+    "localhost.test.build.10gen.cc:27018"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  },
+  "parsed_options": {
+    "defaultDatabase": "some,db"
+  }
+}
diff --git a/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.yml b/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.yml
new file mode 100644
index 00000000000..2b9db7dc3e1
--- /dev/null
+++ b/test/spec/initial-dns-seedlist-discovery/replica-set/dbname-with-commas.yml
@@ -0,0 +1,13 @@
+uri: "mongodb+srv://test1.test.build.10gen.cc/some,db?replicaSet=repl0"
+seeds:
+  - localhost.test.build.10gen.cc:27017
+  - localhost.test.build.10gen.cc:27018
+hosts:
+  - localhost:27017
+  - localhost:27018
+  - localhost:27019
+options:
+  replicaSet: repl0
+  ssl: true
+parsed_options:
+  defaultDatabase: some,db