diff --git a/tests/Disable.test.ts b/tests/Disable.test.ts
index fcea6a685..3c497e736 100644
--- a/tests/Disable.test.ts
+++ b/tests/Disable.test.ts
@@ -80,8 +80,7 @@ describe(`DisableCommand`, () => {
       const dontRemoveBin = await makeBin(cwd, `dont-remove` as Filename);
       binNames.add(ppath.basename(dontRemoveBin));
 
-      process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${process.env.PATH}`;
-      await expect(runCli(cwd, [`disable`, `yarn`])).resolves.toMatchObject({
+      await expect(runCli(cwd, [`disable`, `--install-directory=${npath.fromPortablePath(cwd)}`, `yarn`])).resolves.toMatchObject({
         exitCode: 0,
       });
 
@@ -103,12 +102,14 @@ describe(`DisableCommand`, () => {
       await xfs.mkdirPromise(ppath.join(cwd, `switch/bin`), {recursive: true});
       await xfs.writeFilePromise(ppath.join(cwd, `switch/bin/yarn`), `hello`);
 
-      await xfs.linkPromise(
+      await xfs.symlinkPromise(
         ppath.join(cwd, `switch/bin/yarn`),
         ppath.join(cwd, `yarn`),
       );
 
-      await expect(runCli(cwd, [`disable`])).resolves.toMatchObject({
+      await expect(runCli(cwd, [`disable`, `--install-directory=${npath.fromPortablePath(cwd)}`])).resolves.toMatchObject({
+        stdout: ``,
+        stderr: expect.stringMatching(/^yarn is already installed in .+ and points to a Yarn Switch install - skipping\n$/),
         exitCode: 0,
       });
 
diff --git a/tests/Enable.test.ts b/tests/Enable.test.ts
index 8d559c6b9..c85f91f45 100644
--- a/tests/Enable.test.ts
+++ b/tests/Enable.test.ts
@@ -70,8 +70,7 @@ describe(`EnableCommand`, () => {
     await xfs.mktempPromise(async cwd => {
       const corepackBin = await makeBin(cwd, `corepack` as Filename);
 
-      process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${process.env.PATH}`;
-      await expect(runCli(cwd, [`enable`, `yarn`])).resolves.toMatchObject({
+      await expect(runCli(cwd, [`enable`, `--install-directory=${npath.fromPortablePath(cwd)}`, `yarn`])).resolves.toMatchObject({
         stdout: ``,
         stderr: ``,
         exitCode: 0,