diff --git a/package.json b/package.json
index f92f2eae25..d355436bba 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "mac.ci": "DRIVER=mac2 npx wdio config/wdio.mac.ci.conf.ts",
     "mac.multiremote": "DRIVER=mac2 npx wdio config/wdio.mac.multiremote.conf.ts",
     "windows.app": "powershell -ExecutionPolicy Bypass -File .\\scripts\\windows_app.ps1",
-    "windows.ci": "powershell -File .\\scripts\\windows_ci.ps1",
+    "windows.ci": "powershell -ExecutionPolicy Bypass -File .\\scripts\\windows_ci.ps1",
     "lint": "eslint config tests"
   },
   "repository": {
diff --git a/tests/screenobjects/friends/FriendsScreen.ts b/tests/screenobjects/friends/FriendsScreen.ts
index 41b07f4752..0b2877e2be 100644
--- a/tests/screenobjects/friends/FriendsScreen.ts
+++ b/tests/screenobjects/friends/FriendsScreen.ts
@@ -31,8 +31,8 @@ const SELECTORS_WINDOWS = {
   CONTEXT_MENU: '[name="Context Menu"]',
   CONTEXT_MENU_BLOCK: '[name="friends-block"]',
   CONTEXT_MENU_CHAT: '[name="friends-chat"]',
-  CONTEXT_MENU_COPY_DID_KEY: "<Button>[2]",
-  CONTEXT_MENU_COPY_ID: "<Button>[1]",
+  CONTEXT_MENU_COPY_DID_KEY: '//Button[@Name="copy-id-context"][2]',
+  CONTEXT_MENU_COPY_ID: '//Button[@Name="copy-id-context"][1]',
   CONTEXT_MENU_FAVORITES_ADD: '[name="favorites-add"]',
   CONTEXT_MENU_FAVORITES_REMOVE: '[name="favorites-remove"]',
   CONTEXT_MENU_INCOMING_ACCEPT: '[name="friends-accept"]',
@@ -65,7 +65,7 @@ const SELECTORS_WINDOWS = {
   INPUT_ERROR: '[name="input-error"]',
   INPUT_ERROR_TEXT: "<Text>",
   NO_REQUESTS: '[name="no-requests"]',
-  NO_REQUESTS_TEXT: "<Text>",
+  NO_REQUESTS_TEXT: "//Text/Text",
   OUTGOING_REQUESTS_LIST: '[name="Outgoing Requests List"]',
   OUTGOING_REQUESTS_LIST_LABEL: '[name="outgoing-list-label"]',
   PENDING_FRIENDS_BUTTON: '[name="pending-friends-button"]',
@@ -654,6 +654,12 @@ export default class FriendsScreen extends UplinkMainScreen {
     return userTooltipText;
   }
 
+  async getValueFromAddSomeoneInput() {
+    const addSomeoneInput = await this.addSomeoneInput;
+    const addSomeoneInputText = await addSomeoneInput.getText();
+    return addSomeoneInputText;
+  }
+
   async getValueFromFriendsButtonBadge() {
     const friendsButtonBadgeValue = await this.friendsButtonBadgeText;
     const friendsButtonBadgeValueText = await friendsButtonBadgeValue.getText();
@@ -837,14 +843,12 @@ export default class FriendsScreen extends UplinkMainScreen {
 
   async validateIncomingListIsShown() {
     await this.noRequests.waitForExist({ reverse: true, timeout: 30000 });
-    const incomingList = await this.incomingRequestsList;
-    await incomingList.waitForExist();
+    await this.incomingRequestsList.waitForExist();
   }
 
   async validateNoRequestsIsShown() {
     // Ensure no requests message is displayed
-    const noRequests = await this.noRequests;
-    await noRequests.waitForExist();
+    await this.noRequests.waitForExist();
   }
 
   async validateOutgoingListIsNotEmpty() {
diff --git a/tests/specs/04-friends.spec.ts b/tests/specs/04-friends.spec.ts
index 5ddc8173f2..8e8667557b 100644
--- a/tests/specs/04-friends.spec.ts
+++ b/tests/specs/04-friends.spec.ts
@@ -1,5 +1,5 @@
 require("module-alias/register");
-import { getClipboardValue, resetAndLoginWithCache } from "@helpers/commands";
+import { resetAndLoginWithCache } from "@helpers/commands";
 import ChatsLayout from "@screenobjects/chats/ChatsLayout";
 import ChatsSidebar from "@screenobjects/chats/ChatsSidebar";
 import FavoritesSidebar from "@screenobjects/chats/FavoritesSidebar";
@@ -104,8 +104,9 @@ export default async function friendsTests() {
     // Wait for toast notification to disappear
     await friendsScreen.waitUntilNotificationIsClosed();
 
-    // Validate clipboard text contains Username#
-    const clipboardText = await getClipboardValue();
+    // Validate value copied from Copy ID is correct
+    await friendsScreen.pasteUserKeyInAddSomeone();
+    const clipboardText = await friendsScreen.getValueFromAddSomeoneInput();
     await expect(clipboardText).toContain("ChatUserA#");
   });
 
@@ -117,8 +118,9 @@ export default async function friendsTests() {
     // Wait for toast notification to disappear
     await friendsScreen.waitUntilNotificationIsClosed();
 
-    // Validate clipboard text contains Did Key
-    const clipboardText = await getClipboardValue();
+    // Validate value copied from Copy DID is correct
+    await friendsScreen.pasteUserKeyInAddSomeone();
+    const clipboardText = await friendsScreen.getValueFromAddSomeoneInput();
     await expect(clipboardText).toContain("did:key");
   });
 
@@ -130,8 +132,9 @@ export default async function friendsTests() {
     // Wait for toast notification to disappear
     await friendsScreen.waitUntilNotificationIsClosed();
 
-    // Validate clipboard text contains Username#
-    const clipboardText = await getClipboardValue();
+    // Validate value copied from Copy ID is correct
+    await friendsScreen.pasteUserKeyInAddSomeone();
+    const clipboardText = await friendsScreen.getValueFromAddSomeoneInput();
     await expect(clipboardText).toContain("ChatUserA#");
   });
 
diff --git a/tests/suites/MainTests/02-UplinkWindows.suite.ts b/tests/suites/MainTests/02-UplinkWindows.suite.ts
index 12f24e6250..06b4242c07 100644
--- a/tests/suites/MainTests/02-UplinkWindows.suite.ts
+++ b/tests/suites/MainTests/02-UplinkWindows.suite.ts
@@ -2,6 +2,7 @@ require("module-alias/register");
 import createAccountTests from "@specs/01-create-account.spec";
 import chatsTests from "@specs/02-chats.spec";
 import filesTests from "@specs/03-files.spec";
+import friendsTests from "@specs/04-friends.spec";
 import settingsProfileTests from "@specs/05-settings-profile.spec";
 import settingsGeneralTests from "@specs/06-settings-general.spec";
 import settingsMessagesTests from "@specs/15-settings-messages.spec";
@@ -34,5 +35,6 @@ describe("MacOS Tests", function () {
   describe("Settings About Tests", settingsAboutTests.bind(this));
   describe("Settings Licenses Tests", settingsLicensesTests.bind(this));
   describe("Settings Developer Tests", settingsDeveloperTests.bind(this));
+  describe("Friends Screen Tests", friendsTests.bind(this));
   describe("Import Account Tests", importAccountTests.bind(this));
 });