diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts
index 71886f8ff5f..408785ccf00 100644
--- a/src/harness/fourslashImpl.ts
+++ b/src/harness/fourslashImpl.ts
@@ -2120,7 +2120,8 @@ namespace FourSlash {
         }
 
         private getBaselineFileNameForContainingTestFile(ext = ".baseline") {
-            return ts.getBaseFileName(this.originalInputFileName).replace(ts.Extension.Ts, ext);
+            return this.testData.globalOptions[MetadataOptionNames.baselineFile] ||
+                ts.getBaseFileName(this.originalInputFileName).replace(ts.Extension.Ts, ext);
         }
 
         private getSignatureHelp({ triggerReason }: FourSlashInterface.VerifySignatureHelpOptions): ts.SignatureHelpItems | undefined {
diff --git a/tests/baselines/reference/quickInfoDisplayPartsVarShimspp.baseline b/tests/baselines/reference/quickInfoDisplayPartsVar.shims-pp.baseline
similarity index 98%
rename from tests/baselines/reference/quickInfoDisplayPartsVarShimspp.baseline
rename to tests/baselines/reference/quickInfoDisplayPartsVar.shims-pp.baseline
index 4159f71406c..3e82efaf6b1 100644
--- a/tests/baselines/reference/quickInfoDisplayPartsVarShimspp.baseline
+++ b/tests/baselines/reference/quickInfoDisplayPartsVar.shims-pp.baseline
@@ -1,7 +1,7 @@
 [
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 4,
       "name": "1"
     },
@@ -43,7 +43,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 37,
       "name": "2"
     },
@@ -93,7 +93,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 41,
       "name": "3"
     },
@@ -135,7 +135,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 65,
       "name": "4"
     },
@@ -177,7 +177,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 88,
       "name": "5"
     },
@@ -227,7 +227,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 102,
       "name": "6"
     },
@@ -289,7 +289,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 123,
       "name": "7"
     },
@@ -351,7 +351,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 127,
       "name": "8"
     },
@@ -413,7 +413,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 130,
       "name": "9"
     },
@@ -475,7 +475,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 139,
       "name": "10"
     },
@@ -621,7 +621,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 193,
       "name": "11"
     },
@@ -767,7 +767,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 197,
       "name": "12"
     },
@@ -913,7 +913,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 200,
       "name": "13"
     },
@@ -1019,7 +1019,7 @@
   },
   {
     "marker": {
-      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
+      "fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
       "position": 207,
       "name": "14"
     },
diff --git a/tests/baselines/reference/quickInfoDisplayPartsVarShims.baseline b/tests/baselines/reference/quickInfoDisplayPartsVar.shims.baseline
similarity index 100%
rename from tests/baselines/reference/quickInfoDisplayPartsVarShims.baseline
rename to tests/baselines/reference/quickInfoDisplayPartsVar.shims.baseline
diff --git a/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts b/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts
similarity index 100%
rename from tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts
rename to tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts