diff --git a/packages/service-clients/end-to-end-tests/azure-client/package.json b/packages/service-clients/end-to-end-tests/azure-client/package.json
index 4d4f8c22dcab1..84b2a81aafd39 100644
--- a/packages/service-clients/end-to-end-tests/azure-client/package.json
+++ b/packages/service-clients/end-to-end-tests/azure-client/package.json
@@ -63,6 +63,7 @@
 		"@fluid-experimental/data-objects": "workspace:~",
 		"@fluid-internal/client-utils": "workspace:~",
 		"@fluid-internal/mocha-test-setup": "workspace:~",
+		"@fluid-private/test-version-utils": "workspace:~",
 		"@fluidframework/aqueduct": "workspace:~",
 		"@fluidframework/azure-client": "workspace:~",
 		"@fluidframework/azure-client-legacy": "npm:@fluidframework/azure-client@^1.2.0",
diff --git a/packages/service-clients/end-to-end-tests/azure-client/src/test/.mocharc.cjs b/packages/service-clients/end-to-end-tests/azure-client/src/test/.mocharc.cjs
index d2bc70de9f468..30e3d29b36406 100644
--- a/packages/service-clients/end-to-end-tests/azure-client/src/test/.mocharc.cjs
+++ b/packages/service-clients/end-to-end-tests/azure-client/src/test/.mocharc.cjs
@@ -8,28 +8,4 @@
 const packageDir = `${__dirname}/../..`;
 const getFluidTestMochaConfig = require("@fluid-private/test-version-utils/mocharc-common");
 const config = getFluidTestMochaConfig(packageDir);
-
-// const getFluidTestMochaConfig = require("@fluid-internal/mocha-test-setup/mocharc-common");
-
-// const args = process.argv.slice(2);
-
-// function getFluidTestVariant() {
-// 	const driverIndex = args.indexOf("--driver");
-// 	const endpointIndex = args.indexOf("--r11sEndpointName");
-
-// 	const testDriver = driverIndex !== -1 ? args[driverIndex + 1] : "";
-// 	const endpointName = endpointIndex !== -1 ? args[endpointIndex + 1] : "";
-
-// 	return `${testDriver}-${endpointName}`;
-// }
-
-// function getFluidTestMocha(packageDir, additionalRequiredModules = []) {
-// 	const testVariant = getFluidTestVariant();
-// 	process.env.FLUID_TEST_VARIANT = testVariant;
-
-// 	return getFluidTestMochaConfig(packageDir, additionalRequiredModules, testVariant);
-// }
-
-// module.exports = getFluidTestMocha(packageDir);
-
 module.exports = config;
diff --git a/packages/service-clients/end-to-end-tests/odsp-client/package.json b/packages/service-clients/end-to-end-tests/odsp-client/package.json
index 808111cfa1557..4c799d9f72930 100644
--- a/packages/service-clients/end-to-end-tests/odsp-client/package.json
+++ b/packages/service-clients/end-to-end-tests/odsp-client/package.json
@@ -56,6 +56,7 @@
 	},
 	"dependencies": {
 		"@fluid-internal/mocha-test-setup": "workspace:~",
+		"@fluid-private/test-version-utils": "workspace:~",
 		"@fluidframework/aqueduct": "workspace:~",
 		"@fluidframework/container-definitions": "workspace:~",
 		"@fluidframework/container-loader": "workspace:~",
diff --git a/packages/service-clients/end-to-end-tests/odsp-client/src/test/.mocharc.cjs b/packages/service-clients/end-to-end-tests/odsp-client/src/test/.mocharc.cjs
index 9bedebbaa4bb7..df559aaa872e8 100644
--- a/packages/service-clients/end-to-end-tests/odsp-client/src/test/.mocharc.cjs
+++ b/packages/service-clients/end-to-end-tests/odsp-client/src/test/.mocharc.cjs
@@ -8,28 +8,5 @@
 const packageDir = __dirname;
 const getFluidTestMochaConfig = require("@fluid-private/test-version-utils/mocharc-common");
 const config = getFluidTestMochaConfig(packageDir);
-
-// const getFluidTestMochaConfig = require("@fluid-internal/mocha-test-setup/mocharc-common");
-
-// const args = process.argv.slice(2);
-
-// function getFluidTestVariant() {
-// 	const driverIndex = args.indexOf("--driver");
-// 	const endpointIndex = args.indexOf("--odspEndpointName");
-
-// 	const testDriver = driverIndex !== -1 ? args[driverIndex + 1] : "";
-// 	const endpointName = endpointIndex !== -1 ? args[endpointIndex + 1] : "";
-
-// 	return `${testDriver}-${endpointName}`;
-// }
-
-// function getFluidTestMocha(packageDir, additionalRequiredModules = []) {
-// 	const testVariant = getFluidTestVariant();
-// 	process.env.FLUID_TEST_VARIANT = testVariant;
-
-// 	return getFluidTestMochaConfig(packageDir, additionalRequiredModules, testVariant);
-// }
-
-// module.exports = getFluidTestMocha(packageDir);
-
 module.exports = config;
+
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3936bca87e840..956ff6e265479 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12929,6 +12929,9 @@ importers:
       '@fluid-internal/mocha-test-setup':
         specifier: workspace:~
         version: link:../../../test/mocha-test-setup
+      '@fluid-private/test-version-utils':
+        specifier: workspace:~
+        version: link:../../../test/test-version-utils
       '@fluidframework/aqueduct':
         specifier: workspace:~
         version: link:../../../framework/aqueduct