1 files changed, 8 insertions, 2 deletions
diff --git a/jstests/libs/override_methods/override_fixtures_changestream_multitenancy.js b/jstests/libs/override_methods/override_fixtures_changestream_multitenancy.js
index c9b713bda0c..0ad1b36fc67 100644
--- a/jstests/libs/override_methods/override_fixtures_changestream_multitenancy.js
+++ b/jstests/libs/override_methods/override_fixtures_changestream_multitenancy.js
@@ -7,9 +7,15 @@
 const originalReplSet = ReplSetTest;
 
 ReplSetTest = function(opts) {
+    // Setup the 'serverless' environment if the 'opts' is not a connection string, ie. the
+    // replica-set does not already exist and the replica-set is not part of the sharded cluster,
+    // ie. 'setParametersMongos' property does not exist.
+    const newOpts = typeof opts !== "string" && !TestData.hasOwnProperty("setParametersMongos")
+        ? Object.assign({name: "OverridenServerlessChangeStreamReplSet", serverless: true}, opts)
+        : opts;
+
     // Call the constructor with the original 'ReplSetTest' to populate 'this' with required fields.
-    // TODO SERVER-67267 add {serverless:true} to the 'opts'.
-    originalReplSet.apply(this, [opts]);
+    originalReplSet.apply(this, [newOpts]);
 
     // Make a copy of the original 'startSetAsync' function and then override it to include the
     // required parameters.