diff --git a/src/shell/boards/board-container.tsx b/src/shell/boards/board-container.tsx
index c99825a1..9c40f291 100644
--- a/src/shell/boards/board-container.tsx
+++ b/src/shell/boards/board-container.tsx
@@ -79,7 +79,12 @@ export const BoardContainer: FC = () => {
 	if (isEmpty(boards) || !current) return null;
 	return (
 		<BoardContainerComp expanded={expanded} minimized={minimized}>
-			<Board background="gray6" crossAlignment="unset" expanded={expanded}>
+			<Board
+				data-testid="NewItemContainer"
+				background="gray6"
+				crossAlignment="unset"
+				expanded={expanded}
+			>
 				<BoardHeader background="gray5">
 					<Padding all="extrasmall">
 						<Tooltip label={t('board.hide', 'Hide board')} placement="top">
diff --git a/src/shell/creation-button.tsx b/src/shell/creation-button.tsx
index 1d42568e..3e13724a 100644
--- a/src/shell/creation-button.tsx
+++ b/src/shell/creation-button.tsx
@@ -56,6 +56,7 @@ export const CreationButtonComponent: FC<{ activeRoute: AppRoute; location: Loca
 	return primaryAction ? (
 		<Container minWidth="80px">
 			<MultiButton
+				data-testid="NewItemButton"
 				size="extralarge"
 				background="primary"
 				label={primaryAction?.label ?? t('new', 'New')}
@@ -68,6 +69,7 @@ export const CreationButtonComponent: FC<{ activeRoute: AppRoute; location: Loca
 	) : (
 		<Dropdown items={secondaryActions} onClose={onClose} onOpen={onOpen}>
 			<Button
+				data-testid="NewItemButton"
 				size="extralarge"
 				backgroundColor="primary"
 				label={t('new', 'New')}
diff --git a/src/shell/shell-header.tsx b/src/shell/shell-header.tsx
index c8ab8892..eea78087 100644
--- a/src/shell/shell-header.tsx
+++ b/src/shell/shell-header.tsx
@@ -66,6 +66,7 @@ const ShellHeader: FC<{
 	const searchEnabled = useAppStore((s) => s.views.search.length > 0);
 	return (
 		<Container
+			data-testid="MainHeaderContainer"
 			orientation="horizontal"
 			background="gray3"
 			width="fill"
@@ -84,6 +85,7 @@ const ShellHeader: FC<{
 					maxWidth="75%"
 					mainAlignment="flex-start"
 					minWidth="fit-content"
+					data-testid="HeaderMainLogoContainer"
 				>
 					<Responsive mode="mobile">
 						<Padding right="small">
diff --git a/src/shell/shell-primary-bar.tsx b/src/shell/shell-primary-bar.tsx
index f5e47d2d..7bf8a1ba 100644
--- a/src/shell/shell-primary-bar.tsx
+++ b/src/shell/shell-primary-bar.tsx
@@ -124,6 +124,7 @@ const ShellPrimaryBarComponent: FC<{ activeRoute: AppRoute }> = ({ activeRoute }
 			orientation="vertical"
 			mainAlignment="flex-start"
 			crossAlignment="flex-start"
+			data-testid="SideMenuContainer"
 		>
 			<Row
 				mainAlignment="flex-start"
diff --git a/src/shell/shell-secondary-bar.tsx b/src/shell/shell-secondary-bar.tsx
index 2cdabf9c..99875763 100644
--- a/src/shell/shell-secondary-bar.tsx
+++ b/src/shell/shell-secondary-bar.tsx
@@ -46,6 +46,7 @@ const ShellSecondaryBarComponent: FC<{ activeRoute: AppRoute }> = ({ activeRoute
 	return disabled ? null : (
 		<>
 			<SidebarContainer
+				data-testid="SideSecondaryBarContainer"
 				sidebarIsOpen={isOpen}
 				role="menu"
 				height="fill"