diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts
index 1eb507d0133..ea20c0f9dce 100644
--- a/extensions/vscode-test-resolver/src/extension.ts
+++ b/extensions/vscode-test-resolver/src/extension.ts
@@ -94,7 +94,7 @@ export function activate(context: vscode.ExtensionContext) {
 			env['VSCODE_AGENT_FOLDER'] = remoteDataDir;
 			outputChannel.appendLine(`Using data folder at ${remoteDataDir}`);
 
-			const connectionTokenFile = path.join(remoteDataDir, `${new Date().getTime()}.token`);
+			const connectionTokenFile = path.join(remoteDataDir, `${process.pid}-${new Date().getTime()}.token`);
 			fs.writeFileSync(connectionTokenFile, connectionToken);
 			commandArgs.push('--connection-token-file', connectionTokenFile);
 
@@ -140,6 +140,11 @@ export function activate(context: vscode.ExtensionContext) {
 					if (extHostProcess) {
 						terminateProcess(extHostProcess, context.extensionPath);
 					}
+					try {
+						fs.unlinkSync(connectionTokenFile);
+					} catch (_e) {
+						//ignore
+					}
 				}
 			});
 		});