diff --git a/ghost/portal/src/components/common/NewsletterManagement.js b/ghost/portal/src/components/common/NewsletterManagement.js
index de35d7c99b..6debb52e72 100644
--- a/ghost/portal/src/components/common/NewsletterManagement.js
+++ b/ghost/portal/src/components/common/NewsletterManagement.js
@@ -48,7 +48,7 @@ function NewsletterPrefSection({newsletter, subscribedNewsletters, setSubscribed
     const [showUpdated, setShowUpdated] = useState(false);
     const [timeoutId, setTimeoutId] = useState(null);
     return (
-        <section className='gh-portal-list-toggle-wrapper'>
+        <section className='gh-portal-list-toggle-wrapper' data-test-toggle-wrapper>
             <div className='gh-portal-list-detail'>
                 <h3>{newsletter.name}</h3>
                 <p>{newsletter?.description}</p>
@@ -96,7 +96,7 @@ function CommentsSection({updateCommentNotifications, isCommentsEnabled, enableC
     }
 
     return (
-        <section className='gh-portal-list-toggle-wrapper'>
+        <section className='gh-portal-list-toggle-wrapper' data-test-toggle-wrapper>
             <div className='gh-portal-list-detail'>
                 <h3>Comments</h3>
                 <p>Get notified when someone replies to your comment</p>
@@ -175,7 +175,7 @@ export default function NewsletterManagement({
                             updateSubscribedNewsletters(newsletters);
                         }}
                     />
-                    <CommentsSection 
+                    <CommentsSection
                         isCommentsEnabled={isCommentsEnabled}
                         enableCommentNotifications={enableCommentNotifications}
                         updateCommentNotifications={updateCommentNotifications}
@@ -195,6 +195,7 @@ export default function NewsletterManagement({
                         label='Unsubscribe from all emails'
                         isDestructive={true}
                         style={{width: '100%'}}
+                        dataTestId="unsubscribe-from-all-emails"
                     />
                     <ShowPaidMemberMessage isPaid={isPaidMember} site={site} />
                 </div>
diff --git a/ghost/portal/src/components/common/Switch.js b/ghost/portal/src/components/common/Switch.js
index 35ecb79f1d..c3b91ae3ee 100644
--- a/ghost/portal/src/components/common/Switch.js
+++ b/ghost/portal/src/components/common/Switch.js
@@ -80,7 +80,7 @@ function Switch({id, label = '', onToggle, checked = false, dataTestId = 'switch
         setIsChecked(checked);
     }, [checked, isActionChanged]);
     return (
-        <div className="gh-portal-for-switch">
+        <div className="gh-portal-for-switch" data-test-switch={dataTestId}>
             <label className="switch" htmlFor={id}>
                 <input
                     type="checkbox"
diff --git a/ghost/portal/src/components/pages/NewsletterSelectionPage.js b/ghost/portal/src/components/pages/NewsletterSelectionPage.js
index 492b6e79bb..9f295c01ff 100644
--- a/ghost/portal/src/components/pages/NewsletterSelectionPage.js
+++ b/ghost/portal/src/components/pages/NewsletterSelectionPage.js
@@ -13,7 +13,7 @@ function NewsletterPrefSection({newsletter, subscribedNewsletters, setSubscribed
     });
     if (newsletter.paid) {
         return (
-            <section className='gh-portal-list-toggle-wrapper'>
+            <section className='gh-portal-list-toggle-wrapper' data-test-toggle-wrapper>
                 <div className='gh-portal-list-detail gh-portal-list-big'>
                     <h3>{newsletter.name}</h3>
                     <p>{newsletter.description}</p>
@@ -25,7 +25,7 @@ function NewsletterPrefSection({newsletter, subscribedNewsletters, setSubscribed
         );
     }
     return (
-        <section className='gh-portal-list-toggle-wrapper'>
+        <section className='gh-portal-list-toggle-wrapper' data-test-toggle-wrapper>
             <div className='gh-portal-list-detail gh-portal-list-big'>
                 <h3>{newsletter.name}</h3>
                 <p>{newsletter.description}</p>