diff --git a/server/tests/merged/add/mergedAdd1.test.ts b/server/tests/merged/add/mergedAdd1.test.ts
index 40f671267..3dec6c89c 100644
--- a/server/tests/merged/add/mergedAdd1.test.ts
+++ b/server/tests/merged/add/mergedAdd1.test.ts
@@ -38,7 +38,7 @@ describe(`${chalk.yellowBright("mergedAdd1: Testing merged subs, with track")}`,
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;
diff --git a/server/tests/merged/add/mergedAdd2.test.ts b/server/tests/merged/add/mergedAdd2.test.ts
index 1ebf254fa..b76ee34aa 100644
--- a/server/tests/merged/add/mergedAdd2.test.ts
+++ b/server/tests/merged/add/mergedAdd2.test.ts
@@ -35,7 +35,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing merged subs, downgrade`)}`,
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;
diff --git a/server/tests/merged/add/mergedAdd3.test.ts b/server/tests/merged/add/mergedAdd3.test.ts
index 3261b4ffe..60e9a109f 100644
--- a/server/tests/merged/add/mergedAdd3.test.ts
+++ b/server/tests/merged/add/mergedAdd3.test.ts
@@ -68,7 +68,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing scheduled, and merged add t
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;
diff --git a/server/tests/merged/addOn/mergedAddOn1.test.ts b/server/tests/merged/addOn/mergedAddOn1.test.ts
index 6173b1058..8058c3569 100644
--- a/server/tests/merged/addOn/mergedAddOn1.test.ts
+++ b/server/tests/merged/addOn/mergedAddOn1.test.ts
@@ -102,7 +102,7 @@ describe(`${chalk.yellowBright("mergedAddOn1: Adding an add on")}`, () => {
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;
diff --git a/server/tests/merged/addOn/mergedAddOn2.test.ts b/server/tests/merged/addOn/mergedAddOn2.test.ts
index 8e3c71df0..1e541acf3 100644
--- a/server/tests/merged/addOn/mergedAddOn2.test.ts
+++ b/server/tests/merged/addOn/mergedAddOn2.test.ts
@@ -114,7 +114,7 @@ describe(`${chalk.yellowBright("mergedAddOn2: testing add ons between multiple e
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;
diff --git a/server/tests/merged/addOn/mergedAddOn3.test.ts b/server/tests/merged/addOn/mergedAddOn3.test.ts
index 94d1594cd..9c3db6779 100644
--- a/server/tests/merged/addOn/mergedAddOn3.test.ts
+++ b/server/tests/merged/addOn/mergedAddOn3.test.ts
@@ -102,7 +102,7 @@ describe(`${chalk.yellowBright("mergedAddOn3: testing add ons between multiple e
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;
diff --git a/server/tests/merged/addOn/mergedAddOn4.test.ts b/server/tests/merged/addOn/mergedAddOn4.test.ts
index 146736fd2..4dfdeac37 100644
--- a/server/tests/merged/addOn/mergedAddOn4.test.ts
+++ b/server/tests/merged/addOn/mergedAddOn4.test.ts
@@ -98,7 +98,7 @@ describe(`${chalk.yellowBright("mergedAddOn4: testing cancelling add on immediat
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;
diff --git a/server/tests/merged/addOn/mergedAddOn5.test.ts b/server/tests/merged/addOn/mergedAddOn5.test.ts
index 4ce8374d4..d298885a7 100644
--- a/server/tests/merged/addOn/mergedAddOn5.test.ts
+++ b/server/tests/merged/addOn/mergedAddOn5.test.ts
@@ -98,7 +98,7 @@ describe(`${chalk.yellowBright("mergedAddOn5: testing cancelling add on immediat
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;
diff --git a/server/tests/merged/addOn/mergedAddOn6.test.ts b/server/tests/merged/addOn/mergedAddOn6.test.ts
index 463829821..b2ee9dc78 100644
--- a/server/tests/merged/addOn/mergedAddOn6.test.ts
+++ b/server/tests/merged/addOn/mergedAddOn6.test.ts
@@ -140,7 +140,7 @@ describe(`${chalk.yellowBright("mergedAddOn6: testing update add on quantities o
 	let org: Organization;
 	let env: AppEnv;
 
-	before(async function () {
+	beforeAll(async function () {
 		await setupBefore(this);
 		const { autumnJs } = this;
 		db = this.db;