diff --git a/packages/zwave-js/src/lib/test/driver/bootloaderDetection.test.ts b/packages/zwave-js/src/lib/test/driver/bootloaderDetection.test.ts
index b5673c94e84..c0ea4034c65 100644
--- a/packages/zwave-js/src/lib/test/driver/bootloaderDetection.test.ts
+++ b/packages/zwave-js/src/lib/test/driver/bootloaderDetection.test.ts
@@ -10,7 +10,7 @@ integrationTest(
 		// debug: true,
 
 		additionalDriverOptions: {
-			allowBootloaderOnly: true,
+			bootloaderMode: "allow",
 		},
 
 		async customSetup(driver, mockController, mockNode) {
diff --git a/packages/zwave-js/src/lib/test/integrationTestSuite.ts b/packages/zwave-js/src/lib/test/integrationTestSuite.ts
index 55bb3c7d648..21dbf0c3cca 100644
--- a/packages/zwave-js/src/lib/test/integrationTestSuite.ts
+++ b/packages/zwave-js/src/lib/test/integrationTestSuite.ts
@@ -149,7 +149,10 @@ function suite(
 				}
 			});
 
-			if (options.additionalDriverOptions?.allowBootloaderOnly) {
+			if (
+				options.additionalDriverOptions?.bootloaderMode === "stay"
+				|| options.additionalDriverOptions?.bootloaderMode === "allow"
+			) {
 				driver.once("bootloader ready", () => {
 					process.nextTick(resolve);
 				});
diff --git a/packages/zwave-js/src/lib/test/integrationTestSuiteShared.ts b/packages/zwave-js/src/lib/test/integrationTestSuiteShared.ts
index e9f679567a5..71879d27b68 100644
--- a/packages/zwave-js/src/lib/test/integrationTestSuiteShared.ts
+++ b/packages/zwave-js/src/lib/test/integrationTestSuiteShared.ts
@@ -28,8 +28,9 @@ export function prepareDriver(
 ): Promise<CreateAndStartDriverWithMockPortResult> {
 	// Skipping the bootloader check speeds up tests a lot
 	additionalOptions.testingHooks ??= {};
-	additionalOptions.testingHooks.skipBootloaderCheck = !additionalOptions
-		.allowBootloaderOnly;
+	additionalOptions.testingHooks.skipBootloaderCheck =
+		additionalOptions.bootloaderMode === "recover"
+		|| additionalOptions.bootloaderMode == undefined;
 
 	const logConfig = additionalOptions.logConfig ?? {};
 	if (logToFile) {