diff --git a/tests/integration/tools/atlas/accessLists.test.ts b/tests/integration/tools/atlas/accessLists.test.ts
index a9629961..43e5742d 100644
--- a/tests/integration/tools/atlas/accessLists.test.ts
+++ b/tests/integration/tools/atlas/accessLists.test.ts
@@ -1,5 +1,5 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { describeAtlas, withProject } from "./atlasHelpers.js";
+import { describeWithAtlas, withProject } from "./atlasHelpers.js";
 
 function generateRandomIp() {
     const randomIp: number[] = [192];
@@ -9,7 +9,7 @@ function generateRandomIp() {
     return randomIp.join(".");
 }
 
-describeAtlas("ip access lists", (integration) => {
+describeWithAtlas("ip access lists", (integration) => {
     withProject(integration, ({ getProjectId }) => {
         const ips = [generateRandomIp(), generateRandomIp()];
         const cidrBlocks = [generateRandomIp() + "/16", generateRandomIp() + "/24"];
diff --git a/tests/integration/tools/atlas/clusters.test.ts b/tests/integration/tools/atlas/clusters.test.ts
index bb1b26ee..72f41df0 100644
--- a/tests/integration/tools/atlas/clusters.test.ts
+++ b/tests/integration/tools/atlas/clusters.test.ts
@@ -1,5 +1,5 @@
 import { Session } from "../../../../src/session.js";
-import { describeAtlas, withProject, sleep, randomId } from "./atlasHelpers.js";
+import { describeWithAtlas, withProject, sleep, randomId } from "./atlasHelpers.js";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 
 async function deleteAndWaitCluster(session: Session, projectId: string, clusterName: string) {
@@ -28,7 +28,7 @@ async function deleteAndWaitCluster(session: Session, projectId: string, cluster
     }
 }
 
-describeAtlas("clusters", (integration) => {
+describeWithAtlas("clusters", (integration) => {
     withProject(integration, ({ getProjectId }) => {
         const clusterName = "ClusterTest-" + randomId;
 
diff --git a/tests/integration/tools/atlas/dbUsers.test.ts b/tests/integration/tools/atlas/dbUsers.test.ts
index 77104d44..2a5eb02a 100644
--- a/tests/integration/tools/atlas/dbUsers.test.ts
+++ b/tests/integration/tools/atlas/dbUsers.test.ts
@@ -1,8 +1,8 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { Session } from "../../../../src/session.js";
-import { describeAtlas, withProject, randomId } from "./atlasHelpers.js";
+import { describeWithAtlas, withProject, randomId } from "./atlasHelpers.js";
 
-describeAtlas("db users", (integration) => {
+describeWithAtlas("db users", (integration) => {
     const userName = "testuser-" + randomId;
     withProject(integration, ({ getProjectId }) => {
         afterAll(async () => {
diff --git a/tests/integration/tools/atlas/orgs.test.ts b/tests/integration/tools/atlas/orgs.test.ts
index 87d8a327..ca86e4b9 100644
--- a/tests/integration/tools/atlas/orgs.test.ts
+++ b/tests/integration/tools/atlas/orgs.test.ts
@@ -1,8 +1,8 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { setupIntegrationTest } from "../../helpers.js";
-import { parseTable, describeAtlas } from "./atlasHelpers.js";
+import { parseTable, describeWithAtlas } from "./atlasHelpers.js";
 
-describeAtlas("orgs", (integration) => {
+describeWithAtlas("orgs", (integration) => {
     describe("atlas-list-orgs", () => {
         it("should have correct metadata", async () => {
             const { tools } = await integration.mcpClient().listTools();
diff --git a/tests/integration/tools/atlas/projects.test.ts b/tests/integration/tools/atlas/projects.test.ts
index 1156468a..3f570183 100644
--- a/tests/integration/tools/atlas/projects.test.ts
+++ b/tests/integration/tools/atlas/projects.test.ts
@@ -1,10 +1,10 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { ObjectId } from "mongodb";
-import { parseTable, describeAtlas } from "./atlasHelpers.js";
+import { parseTable, describeWithAtlas } from "./atlasHelpers.js";
 
 const randomId = new ObjectId().toString();
 
-describeAtlas("projects", (integration) => {
+describeWithAtlas("projects", (integration) => {
     const projName = "testProj-" + randomId;
 
     afterAll(async () => {
diff --git a/tests/integration/tools/mongodb/create/createCollection.test.ts b/tests/integration/tools/mongodb/create/createCollection.test.ts
index 1735bad7..3fd5723f 100644
--- a/tests/integration/tools/mongodb/create/createCollection.test.ts
+++ b/tests/integration/tools/mongodb/create/createCollection.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseContent,
@@ -10,7 +10,7 @@ import {
     dbOperationInvalidArgTests,
 } from "../../../helpers.js";
 
-describeMongoDB("createCollection tool", (integration) => {
+describeWithMongoDB("createCollection tool", (integration) => {
     validateToolMetadata(
         integration,
         "create-collection",
diff --git a/tests/integration/tools/mongodb/create/createIndex.test.ts b/tests/integration/tools/mongodb/create/createIndex.test.ts
index c2c12417..1112b876 100644
--- a/tests/integration/tools/mongodb/create/createIndex.test.ts
+++ b/tests/integration/tools/mongodb/create/createIndex.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseContent,
@@ -10,7 +10,7 @@ import {
 } from "../../../helpers.js";
 import { IndexDirection } from "mongodb";
 
-describeMongoDB("createIndex tool", (integration) => {
+describeWithMongoDB("createIndex tool", (integration) => {
     validateToolMetadata(integration, "create-index", "Create an index for a collection", [
         ...dbOperationParameters,
         {
diff --git a/tests/integration/tools/mongodb/create/insertMany.test.ts b/tests/integration/tools/mongodb/create/insertMany.test.ts
index 9668647f..197b245e 100644
--- a/tests/integration/tools/mongodb/create/insertMany.test.ts
+++ b/tests/integration/tools/mongodb/create/insertMany.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseContent,
@@ -9,7 +9,7 @@ import {
     validateThrowsForInvalidArguments,
 } from "../../../helpers.js";
 
-describeMongoDB("insertMany tool", (integration) => {
+describeWithMongoDB("insertMany tool", (integration) => {
     validateToolMetadata(integration, "insert-many", "Insert an array of documents into a MongoDB collection", [
         ...dbOperationParameters,
         {
diff --git a/tests/integration/tools/mongodb/delete/deleteMany.test.ts b/tests/integration/tools/mongodb/delete/deleteMany.test.ts
index e5db88f1..05f8a417 100644
--- a/tests/integration/tools/mongodb/delete/deleteMany.test.ts
+++ b/tests/integration/tools/mongodb/delete/deleteMany.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseContent,
@@ -9,7 +9,7 @@ import {
     validateThrowsForInvalidArguments,
 } from "../../../helpers.js";
 
-describeMongoDB("deleteMany tool", (integration) => {
+describeWithMongoDB("deleteMany tool", (integration) => {
     validateToolMetadata(
         integration,
         "delete-many",
diff --git a/tests/integration/tools/mongodb/delete/dropCollection.test.ts b/tests/integration/tools/mongodb/delete/dropCollection.test.ts
index b2b61f65..884e1c13 100644
--- a/tests/integration/tools/mongodb/delete/dropCollection.test.ts
+++ b/tests/integration/tools/mongodb/delete/dropCollection.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseContent,
@@ -10,7 +10,7 @@ import {
     dbOperationInvalidArgTests,
 } from "../../../helpers.js";
 
-describeMongoDB("dropCollection tool", (integration) => {
+describeWithMongoDB("dropCollection tool", (integration) => {
     validateToolMetadata(
         integration,
         "drop-collection",
diff --git a/tests/integration/tools/mongodb/delete/dropDatabase.test.ts b/tests/integration/tools/mongodb/delete/dropDatabase.test.ts
index 0b06f532..e6ec15f2 100644
--- a/tests/integration/tools/mongodb/delete/dropDatabase.test.ts
+++ b/tests/integration/tools/mongodb/delete/dropDatabase.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseContent,
@@ -10,7 +10,7 @@ import {
     dbOperationInvalidArgTests,
 } from "../../../helpers.js";
 
-describeMongoDB("dropDatabase tool", (integration) => {
+describeWithMongoDB("dropDatabase tool", (integration) => {
     validateToolMetadata(
         integration,
         "drop-database",
diff --git a/tests/integration/tools/mongodb/metadata/collectionSchema.test.ts b/tests/integration/tools/mongodb/metadata/collectionSchema.test.ts
index 7a14979b..9e48cca4 100644
--- a/tests/integration/tools/mongodb/metadata/collectionSchema.test.ts
+++ b/tests/integration/tools/mongodb/metadata/collectionSchema.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseElements,
@@ -14,7 +14,7 @@ import { Document } from "bson";
 import { OptionalId } from "mongodb";
 import { SimplifiedSchema } from "mongodb-schema";
 
-describeMongoDB("collectionSchema tool", (integration) => {
+describeWithMongoDB("collectionSchema tool", (integration) => {
     validateToolMetadata(
         integration,
         "collection-schema",
diff --git a/tests/integration/tools/mongodb/metadata/collectionStorageSize.test.ts b/tests/integration/tools/mongodb/metadata/collectionStorageSize.test.ts
index fb2259bd..4428f145 100644
--- a/tests/integration/tools/mongodb/metadata/collectionStorageSize.test.ts
+++ b/tests/integration/tools/mongodb/metadata/collectionStorageSize.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseContent,
@@ -11,7 +11,7 @@ import {
 } from "../../../helpers.js";
 import * as crypto from "crypto";
 
-describeMongoDB("collectionStorageSize tool", (integration) => {
+describeWithMongoDB("collectionStorageSize tool", (integration) => {
     validateToolMetadata(
         integration,
         "collection-storage-size",
diff --git a/tests/integration/tools/mongodb/metadata/connect.test.ts b/tests/integration/tools/mongodb/metadata/connect.test.ts
index fc80a1be..a13f5f98 100644
--- a/tests/integration/tools/mongodb/metadata/connect.test.ts
+++ b/tests/integration/tools/mongodb/metadata/connect.test.ts
@@ -1,10 +1,10 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import { getResponseContent, setupIntegrationTest, validateToolMetadata } from "../../../helpers.js";
 
 import { config } from "../../../../../src/config.js";
 
-describeMongoDB("Connect tool", (integration) => {
+describeWithMongoDB("Connect tool", (integration) => {
     validateToolMetadata(integration, "connect", "Connect to a MongoDB instance", [
         {
             name: "options",
diff --git a/tests/integration/tools/mongodb/metadata/listCollections.test.ts b/tests/integration/tools/mongodb/metadata/listCollections.test.ts
index b3e9a7d8..cfb67d4d 100644
--- a/tests/integration/tools/mongodb/metadata/listCollections.test.ts
+++ b/tests/integration/tools/mongodb/metadata/listCollections.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseElements,
@@ -10,7 +10,7 @@ import {
     dbOperationInvalidArgTests,
 } from "../../../helpers.js";
 
-describeMongoDB("listCollections tool", (integration) => {
+describeWithMongoDB("listCollections tool", (integration) => {
     validateToolMetadata(integration, "list-collections", "List all collections for a given database", [
         { name: "database", description: "Database name", type: "string", required: true },
     ]);
diff --git a/tests/integration/tools/mongodb/metadata/listDatabases.test.ts b/tests/integration/tools/mongodb/metadata/listDatabases.test.ts
index 75f039ea..12d2870e 100644
--- a/tests/integration/tools/mongodb/metadata/listDatabases.test.ts
+++ b/tests/integration/tools/mongodb/metadata/listDatabases.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseElements,
@@ -8,7 +8,7 @@ import {
 } from "../../../helpers.js";
 import { toIncludeSameMembers } from "jest-extended";
 
-describeMongoDB("listDatabases tool", (integration) => {
+describeWithMongoDB("listDatabases tool", (integration) => {
     const defaultDatabases = ["admin", "config", "local"];
 
     it("should have correct metadata", async () => {
diff --git a/tests/integration/tools/mongodb/read/count.test.ts b/tests/integration/tools/mongodb/read/count.test.ts
index cf00c750..4a6fcb69 100644
--- a/tests/integration/tools/mongodb/read/count.test.ts
+++ b/tests/integration/tools/mongodb/read/count.test.ts
@@ -1,4 +1,4 @@
-import { describeMongoDB } from "../mongodbHelpers.js";
+import { describeWithMongoDB } from "../mongodbHelpers.js";
 
 import {
     getResponseContent,
@@ -9,7 +9,7 @@ import {
     validateThrowsForInvalidArguments,
 } from "../../../helpers.js";
 
-describeMongoDB("count tool", (integration) => {
+describeWithMongoDB("count tool", (integration) => {
     validateToolMetadata(integration, "count", "Gets the number of documents in a MongoDB collection", [
         {
             name: "query",