diff --git a/client/src/components/buttons/Button.tsx b/client/src/components/buttons/Button.tsx
index 307d045ea8..68e0b4e8bb 100644
--- a/client/src/components/buttons/Button.tsx
+++ b/client/src/components/buttons/Button.tsx
@@ -125,6 +125,7 @@ interface ButtonWithMenuV2Props {
   children?: React.ReactNode;
   className?: string;
   color?: string;
+  dataCy?: string;
   default: React.ReactNode;
   direction?: "up" | "down" | "start" | "end";
   disabled?: boolean;
@@ -139,6 +140,7 @@ export function SplitButtonWithMenu({
   children,
   className,
   color,
+  dataCy,
   default: defaultButton,
   direction,
   disabled,
@@ -168,7 +170,7 @@ export function SplitButtonWithMenu({
         className={cx("border-start-0", "dropdown-toggle-split")}
         data-bs-toggle="dropdown"
         color={color ?? "primary"}
-        data-cy="button-with-menu-dropdown"
+        data-cy={dataCy ?? "button-with-menu-dropdown"}
         disabled={isDisabledDropdownToggle ?? disabled}
       />
       <DropdownMenu end>{children}</DropdownMenu>
diff --git a/client/src/features/ProjectPageV2/ProjectPageContent/ProjectInformation/ProjectInformation.tsx b/client/src/features/ProjectPageV2/ProjectPageContent/ProjectInformation/ProjectInformation.tsx
index 42b96fe635..964d6fcadc 100644
--- a/client/src/features/ProjectPageV2/ProjectPageContent/ProjectInformation/ProjectInformation.tsx
+++ b/client/src/features/ProjectPageV2/ProjectPageContent/ProjectInformation/ProjectInformation.tsx
@@ -160,7 +160,9 @@ export default function ProjectInformation({
         title="Namespace:"
       >
         <p className="mb-0">
-          <Link to={namespaceUrl}>{namespaceName}</Link>
+          <Link data-cy="project-namespace-link" to={namespaceUrl}>
+            {namespaceName}
+          </Link>
         </p>
       </ProjectInformationBox>
       <ProjectInformationBox icon={<Eye className="bi" />} title="Visibility:">
diff --git a/client/src/features/dashboardV2/DashboardV2.tsx b/client/src/features/dashboardV2/DashboardV2.tsx
index 287e365694..75956824c8 100644
--- a/client/src/features/dashboardV2/DashboardV2.tsx
+++ b/client/src/features/dashboardV2/DashboardV2.tsx
@@ -347,6 +347,7 @@ function UserDashboard() {
           <Link
             to={userPageUrl}
             className={cx("link-primary", "stretched-link")}
+            data-cy="user-namespace-link"
           >
             @{userInfo.username ?? "unknown"}
           </Link>
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorActions.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorActions.tsx
index 97bf6e2b5a..69f214cad9 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorActions.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorActions.tsx
@@ -490,6 +490,7 @@ function DataConnectorActionsInner({
     ) : (
       <ButtonWithMenuV2
         color="outline-primary"
+        dataCy="data-connector-menu-dropdown"
         default={
           <Button
             color="outline-primary"
diff --git a/client/src/features/session/components/SessionsList.tsx b/client/src/features/session/components/SessionsList.tsx
index e18a61f890..8f5333eb40 100644
--- a/client/src/features/session/components/SessionsList.tsx
+++ b/client/src/features/session/components/SessionsList.tsx
@@ -353,7 +353,7 @@ export function SessionRowResourceRequests({
     ) : null;
 
   return (
-    <div>
+    <div data-cy="session-view-resource-class-description">
       {resourceClassName && (
         <span key="name">
           <span className="text-nowrap">{resourceClassName}</span>
diff --git a/client/src/features/sessionsV2/DeleteSessionLauncherModal.tsx b/client/src/features/sessionsV2/DeleteSessionLauncherModal.tsx
index 140386af2b..5043268dbe 100644
--- a/client/src/features/sessionsV2/DeleteSessionLauncherModal.tsx
+++ b/client/src/features/sessionsV2/DeleteSessionLauncherModal.tsx
@@ -69,7 +69,7 @@ export default function DeleteSessionLauncherModal({
       size="lg"
       toggle={toggle}
     >
-      <ModalHeader className="text-danger" tag="h2" toggle={toggle}>
+      <ModalHeader className="text-danger" data-cy="delete-session-launcher-title" tag="h2" toggle={toggle}>
         Delete session launcher
       </ModalHeader>
       <ModalBody>
@@ -107,6 +107,7 @@ export default function DeleteSessionLauncherModal({
         </Button>
         <Button
           color="danger"
+          data-cy="delete-session-launcher-button"
           disabled={result.isLoading}
           onClick={onDelete}
           type="button"
diff --git a/client/src/features/sessionsV2/SessionImageModal.tsx b/client/src/features/sessionsV2/SessionImageModal.tsx
index b87b6f6232..c31029e065 100644
--- a/client/src/features/sessionsV2/SessionImageModal.tsx
+++ b/client/src/features/sessionsV2/SessionImageModal.tsx
@@ -163,10 +163,10 @@ export default function SessionImageModal({
       isOpen={isOpen}
       size="lg"
     >
-      <ModalHeader tag="h2">Session image not accessible</ModalHeader>
+      <ModalHeader tag="h2" data-cy="session-image-not-accessible-header">Session image not accessible</ModalHeader>
       <ModalBody>{content}</ModalBody>
       <ModalFooter>
-        <Button color="outline-danger" onClick={onCancel}>
+        <Button color="outline-danger" onClick={onCancel} data-cy="session-image-not-accessible-cancel-button">
           <XLg className={cx("bi", "me-1")} />
           Cancel
         </Button>
diff --git a/client/src/features/sessionsV2/SessionView/EnvironmentCard.tsx b/client/src/features/sessionsV2/SessionView/EnvironmentCard.tsx
index 26759f4853..bdf8cf664a 100644
--- a/client/src/features/sessionsV2/SessionView/EnvironmentCard.tsx
+++ b/client/src/features/sessionsV2/SessionView/EnvironmentCard.tsx
@@ -267,6 +267,7 @@ function CustomImageEnvironmentValues({
         )}
       </div>
       <EnvironmentRowWithLabel
+        dataCy="session-view-session-environment-image"
         label="Container image"
         value={environment?.container_image || ""}
       />
@@ -470,15 +471,17 @@ function EnvironmentRow({ children }: { children?: ReactNode }) {
 function EnvironmentRowWithLabel({
   label,
   value,
+  dataCy,
 }: {
   label: string;
   value?: string | number | null;
+  dataCy?: string;
 }) {
   return (
     <EnvironmentRow>
       <div className="d-block">
         <label className={cx("text-nowrap", "mb-0", "me-2")}>{label}:</label>
-        <code>{value ?? "-"}</code>
+        <code data-cy={dataCy}>{value ?? "-"}</code>
       </div>
     </EnvironmentRow>
   );
diff --git a/client/src/features/sessionsV2/SessionView/SessionView.tsx b/client/src/features/sessionsV2/SessionView/SessionView.tsx
index a34d180d3d..c6914c0dd7 100644
--- a/client/src/features/sessionsV2/SessionView/SessionView.tsx
+++ b/client/src/features/sessionsV2/SessionView/SessionView.tsx
@@ -383,6 +383,7 @@ export function SessionView({
                     <>
                       <Button
                         color="outline-primary"
+                        data-cy="session-view-modify-session-environment-button"
                         id="modify-session-environment-button"
                         onClick={toggle}
                         size="sm"
@@ -409,7 +410,7 @@ export function SessionView({
           )}
           <div>
             <div className={cx("d-flex", "justify-content-between", "mb-2")}>
-              <h3 className="my-auto">Default Resource Class</h3>
+              <h3 className="my-auto" data-cy="session-view-resource-class-heading">Default Resource Class</h3>
               {launcher && (
                 <PermissionsGuard
                   disabled={null}
@@ -421,6 +422,7 @@ export function SessionView({
                         onClick={toggleModifyResources}
                         size="sm"
                         tabIndex={0}
+                        data-cy="session-view-resource-class-edit-button"
                       >
                         <Pencil className="bi" />
                       </Button>
diff --git a/client/src/features/sessionsV2/SessionsV2.tsx b/client/src/features/sessionsV2/SessionsV2.tsx
index c619818e29..cb4cf3e1e9 100644
--- a/client/src/features/sessionsV2/SessionsV2.tsx
+++ b/client/src/features/sessionsV2/SessionsV2.tsx
@@ -211,6 +211,7 @@ export function SessionV2Actions({
             <>
               <ButtonWithMenuV2
                 color="outline-primary"
+                dataCy="session-launcher-menu-dropdown"
                 default={defaultAction}
                 preventPropagation
                 size="sm"
diff --git a/client/src/features/sessionsV2/components/SessionModals/ModifyResourcesLauncher.tsx b/client/src/features/sessionsV2/components/SessionModals/ModifyResourcesLauncher.tsx
index 6a9f418524..ec40f02b54 100644
--- a/client/src/features/sessionsV2/components/SessionModals/ModifyResourcesLauncher.tsx
+++ b/client/src/features/sessionsV2/components/SessionModals/ModifyResourcesLauncher.tsx
@@ -168,7 +168,7 @@ export function ModifyResourcesLauncherModal({
       size="lg"
       toggle={toggleModal}
     >
-      <ModalHeader tag="h2" toggle={toggleModal}>
+      <ModalHeader tag="h2" toggle={toggleModal} data-cy="set-resource-class-header">
         Set default resource class
       </ModalHeader>
       <ModalBody>
@@ -176,7 +176,7 @@ export function ModifyResourcesLauncherModal({
           <ErrorOrNotAvailableResourcePools title="Error modifying resources" />
         )}
         {result.isSuccess && (
-          <SuccessAlert dismissible={false}>
+          <SuccessAlert dismissible={false} data-cy="set-resource-class-success-alert">
             <h3 className={cx("fs-6", "fw-bold")}>
               Default resource class updated
             </h3>
@@ -269,7 +269,7 @@ export function ModifyResourcesLauncherModal({
         )}
       </ModalBody>
       <ModalFooter>
-        <Button color="outline-primary" onClick={toggleModal}>
+        <Button color="outline-primary" onClick={toggleModal} data-cy="set-resource-class-cancel-button">
           <XLg className={cx("bi", "me-1")} />
           Cancel
         </Button>
@@ -284,6 +284,7 @@ export function ModifyResourcesLauncherModal({
           }
           onClick={onSubmit}
           type="submit"
+          data-cy="set-resource-class-submit-button"
         >
           {result.isLoading ? (
             <Loader className="me-1" inline size={16} />