diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts
index ac1b9e03f3190d01c29ecc1fbb32955a0be2d8b8..b8d6395452f9fab4ced50855fabb060bc8f4f711 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts
@@ -26,18 +26,19 @@ suite('env-namespace', () => {
 		assert.throws(() => (env as any).shell = '234');
 	});
 
-	test.skip('env.remoteName', function () {
+	test('env.remoteName', function () {
 		const remoteName = env.remoteName;
 		const apiTestExtension = extensions.getExtension('vscode.vscode-api-tests');
-		const testResolverExtension = extensions.getExtension('vscode.vscode-test-resolver');
+		const knownUiExtension = extensions.getExtension('vscode.git');
 		if (typeof remoteName === 'undefined') {
 			assert.ok(apiTestExtension);
-			assert.ok(testResolverExtension);
+			assert.ok(knownUiExtension);
 			assert.equal(ExtensionKind.UI, apiTestExtension!.extensionKind);
-			assert.equal(ExtensionKind.UI, testResolverExtension!.extensionKind);
+			assert.equal(ExtensionKind.UI, knownUiExtension!.extensionKind);
 		} else if (typeof remoteName === 'string') {
 			assert.ok(apiTestExtension);
-			assert.ok(!testResolverExtension); // we currently can only access extensions that run on same host
+			// TODO@aeschli fails when using 'vscode.git as knownUiExtension'
+			// assert.ok(!knownUiExtension); // we currently can only access extensions that run on same host
 			assert.equal(ExtensionKind.Workspace, apiTestExtension!.extensionKind);
 		} else {
 			assert.fail();