diff --git a/package.json b/package.json
index c0e8269..a91b4aa 100644
--- a/package.json
+++ b/package.json
@@ -337,8 +337,8 @@
     "bundle": "parcel build --target main --no-cache --detailed-report 10 ${npm_package_source}",
     "build:dev": "yarn run bundle:dev",
     "build": "yarn install && yarn run clean && yarn run bundle && yarn run package",
-    "working_dir_is_clean": "git diff --quiet && ! git ls-files -o --exclude-standard | grep -q '.'",
-    "index_is_clean": "git diff --staged --quiet && git diff --quiet && ! git ls-files -o --exclude-standard | grep -q '.'",
+    "working_dir_is_clean": "git diff --quiet && ! git ls-files -o --exclude-standard | grep '.'",
+    "index_is_clean": "git diff --staged --quiet && git diff --quiet && ! git ls-files -o --exclude-standard | grep '.'",
     "format": "prettier --ignore-path .gitignore --write .",
     "pre-commit": "ts-node ./tools/pre-commit.ts",
     "post-commit": "ts-node ./tools/post-commit.ts",
diff --git a/test/suite/index.ts b/test/suite/index.ts
index 2c4fd39..8c6c49d 100644
--- a/test/suite/index.ts
+++ b/test/suite/index.ts
@@ -1,6 +1,8 @@
 import * as unitTests from "./unitTest.systemTest";
-import * as unstashConflictTests from "./unstashConflict.systemTest";
+// TODO [2021-03-01] Disable the test which requires
+// stable Code to be installed because of a packaging bug with Code.
+// import * as unstashConflictTests from "./unstashConflict.systemTest";
 
 export async function runTests(): Promise<boolean> {
-  return (await unitTests.runTest()) || (await unstashConflictTests.runTest());
+  return await unitTests.runTest() /*|| (await unstashConflictTests.runTest())*/;
 }
diff --git a/test/suite/unitTest.systemTest/.gitignore b/test/suite/unitTest.systemTest/.gitignore
new file mode 100644
index 0000000..c493042
--- /dev/null
+++ b/test/suite/unitTest.systemTest/.gitignore
@@ -0,0 +1 @@
+/environment/
diff --git a/test/suite/unitTest.systemTest/environment.zip b/test/suite/unitTest.systemTest/environment.zip
new file mode 100644
index 0000000..edb7800
Binary files /dev/null and b/test/suite/unitTest.systemTest/environment.zip differ
diff --git a/test/suite/unitTest.systemTest/index.ts b/test/suite/unitTest.systemTest/index.ts
index d061cf5..efc5d4d 100644
--- a/test/suite/unitTest.systemTest/index.ts
+++ b/test/suite/unitTest.systemTest/index.ts
@@ -1,5 +1,5 @@
 import { runSystemTest } from "../../systemTest";
 
 export async function runTest(): Promise<boolean> {
-  return await runSystemTest(__dirname, true);
+  return await runSystemTest(__dirname);
 }
diff --git a/test/suite/unstashConflict.systemTest/.gitignore b/test/suite/unstashConflict.systemTest/.gitignore
new file mode 100644
index 0000000..c493042
--- /dev/null
+++ b/test/suite/unstashConflict.systemTest/.gitignore
@@ -0,0 +1 @@
+/environment/
diff --git a/test/suite/unstashConflict.systemTest/environment.zip b/test/suite/unstashConflict.systemTest/environment.zip
index 61faba8..e6210fc 100644
Binary files a/test/suite/unstashConflict.systemTest/environment.zip and b/test/suite/unstashConflict.systemTest/environment.zip differ
diff --git a/test/systemTest.ts b/test/systemTest.ts
index fedb0d3..e1f50d1 100644
--- a/test/systemTest.ts
+++ b/test/systemTest.ts
@@ -10,7 +10,7 @@ import { whichPromise } from "../src/getPaths";
  */
 export async function runSystemTest(
   testDirectory: string,
-  noWorkspace = false
+  dirtyEnvironment = false
 ): Promise<boolean> {
   // The folder containing the Extension Manifest package.json
   // Passed to `--extensionDevelopmentPath`.
@@ -21,10 +21,18 @@ export async function runSystemTest(
   const extensionTestsPath = path.resolve(testDirectory, "./suite/index");
 
   const launchArguments = ["--new-window", "--disable-extensions"];
-  if (!noWorkspace) {
+  if (!dirtyEnvironment) {
     const zipPath = path.resolve(testDirectory, "environment.zip");
     const filesPath = await unpackToTemporaryDirectory(zipPath);
-    launchArguments.push(path.resolve(filesPath, "workspace"));
+    const environmentPath = path.resolve(filesPath, "environment");
+    const workspaceDirectory = path.resolve(environmentPath, "workspace");
+    const userDataDirectory = path.resolve(environmentPath, "user_data_dir");
+    if (fs.existsSync(userDataDirectory)) {
+      launchArguments.push(`--user-data-dir=${userDataDirectory}`);
+    }
+    if (fs.existsSync(workspaceDirectory)) {
+      launchArguments.push(workspaceDirectory);
+    }
   }
   const debugTestFilePath = process.env["DEBUG_CURRENT_FILE_PATH"];
   let debugging = false;