diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index ce2ba0ef9ed..1977a7e2568 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -152,7 +152,7 @@ stages:
         dependsOn:
           - Compile
         pool:
-          vmImage: windows-2019
+          vmImage: windows-latest
         jobs:
           - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
               - job: Windows
diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml
index c896669a44a..d417a1c4ed6 100644
--- a/build/azure-pipelines/sdl-scan.yml
+++ b/build/azure-pipelines/sdl-scan.yml
@@ -35,7 +35,7 @@ stages:
   - stage: Windows
     condition: eq(variables.SCAN_WINDOWS, 'true')
     pool:
-      vmImage: windows-2019
+      vmImage: windows-latest
     jobs:
       - job: WindowsJob
         timeoutInMinutes: 0
diff --git a/src/vs/workbench/services/search/test/node/search.integrationTest.ts b/src/vs/workbench/services/search/test/node/search.integrationTest.ts
index 0fad3392e6f..d7337062172 100644
--- a/src/vs/workbench/services/search/test/node/search.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/search.integrationTest.ts
@@ -11,6 +11,7 @@ import { URI } from 'vs/base/common/uri';
 import { IFolderQuery, QueryType, IRawFileMatch } from 'vs/workbench/services/search/common/search';
 import { Engine as FileSearchEngine, FileWalker } from 'vs/workbench/services/search/node/fileSearch';
 import { flakySuite, getPathFromAmdModule } from 'vs/base/test/node/testUtils';
+import { readdirSync } from 'fs';
 
 const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const EXAMPLES_FIXTURES = URI.file(path.join(TEST_FIXTURES, 'examples'));
@@ -482,6 +483,15 @@ flakySuite('FileSearchEngine', () => {
 			includePattern: { '**/üm laut汉语/*': true }
 		});
 
+		console.log('log thing');
+		readdirSync(TEST_FIXTURES).forEach(function (fixtureFolder) {
+			console.log('1: ' + fixtureFolder);
+		});
+
+		readdirSync(`${TEST_FIXTURES}\\üm laut汉语`).forEach(function (fixtureFolder) {
+			console.log('2: ' + fixtureFolder);
+		});
+
 		let count = 0;
 		engine.search((result) => {
 			if (result) {