diff --git a/assets/js/src/settings/pages/advanced/inactive_subscribers.tsx b/assets/js/src/settings/pages/advanced/inactive_subscribers.tsx
index 1070242263..b472fd0bb2 100644
--- a/assets/js/src/settings/pages/advanced/inactive_subscribers.tsx
+++ b/assets/js/src/settings/pages/advanced/inactive_subscribers.tsx
@@ -6,7 +6,7 @@ import { Label, Inputs } from 'settings/components';
 
 export default function InactiveSubscribers() {
   const [duration, setDuration] = useSetting('deactivate_subscriber_after_inactive_days');
-
+  const [trackingEnabled] = useSetting('tracking', 'enabled');
   return (
     <>
       <Label
@@ -28,49 +28,56 @@ export default function InactiveSubscribers() {
         htmlFor=""
       />
       <Inputs>
-        <input
-          type="radio"
-          id="inactive-subscribers-disabled"
-          value=""
-          checked={duration === ''}
-          onChange={onChange(setDuration)}
-        />
-        <label htmlFor="inactive-subscribers-disabled">
-          {t('never')}
-        </label>
-        <br />
-        <input
-          type="radio"
-          id="inactive-subscribers-3-months"
-          value="90"
-          checked={duration === '90'}
-          onChange={onChange(setDuration)}
-        />
-        <label htmlFor="inactive-subscribers-3-months">
-          {t('after3months')}
-        </label>
-        <br />
-        <input
-          type="radio"
-          id="inactive-subscribers-6-months"
-          value="180"
-          checked={duration === '180'}
-          onChange={onChange(setDuration)}
-        />
-        <label htmlFor="inactive-subscribers-6-months">
-          {t('after6months')}
-        </label>
-        <br />
-        <input
-          type="radio"
-          id="inactive-subscribers-12-months"
-          value="365"
-          checked={duration === '365'}
-          onChange={onChange(setDuration)}
-        />
-        <label htmlFor="inactive-subscribers-12-months">
-          {t('after12months')}
-        </label>
+        {!trackingEnabled && <p data-automation-id="inactive-subscribers-disabled">{t('disabledBecauseTrackingIs')}</p>}
+        {trackingEnabled && (
+          <div data-automation-id="inactive-subscribers-enabled">
+            <input
+              type="radio"
+              id="inactive-subscribers-disabled"
+              data-automation-id="inactive-subscribers-option-never"
+              value=""
+              checked={duration === ''}
+              onChange={onChange(setDuration)}
+            />
+            <label htmlFor="inactive-subscribers-disabled">
+              {t('never')}
+            </label>
+            <br />
+            <input
+              type="radio"
+              id="inactive-subscribers-3-months"
+              value="90"
+              checked={duration === '90'}
+              onChange={onChange(setDuration)}
+            />
+            <label htmlFor="inactive-subscribers-3-months">
+              {t('after3months')}
+            </label>
+            <br />
+            <input
+              type="radio"
+              id="inactive-subscribers-6-months"
+              value="180"
+              checked={duration === '180'}
+              onChange={onChange(setDuration)}
+              data-automation-id="inactive-subscribers-default"
+            />
+            <label htmlFor="inactive-subscribers-6-months">
+              {t('after6months')}
+            </label>
+            <br />
+            <input
+              type="radio"
+              id="inactive-subscribers-12-months"
+              value="365"
+              checked={duration === '365'}
+              onChange={onChange(setDuration)}
+            />
+            <label htmlFor="inactive-subscribers-12-months">
+              {t('after12months')}
+            </label>
+          </div>
+        )}
       </Inputs>
     </>
   );
diff --git a/assets/js/src/settings/pages/advanced/reinstall.tsx b/assets/js/src/settings/pages/advanced/reinstall.tsx
index 5161ac4180..469cd3cdd7 100644
--- a/assets/js/src/settings/pages/advanced/reinstall.tsx
+++ b/assets/js/src/settings/pages/advanced/reinstall.tsx
@@ -27,7 +27,14 @@ export default function Reinstall() {
         htmlFor=""
       />
       <Inputs>
-        <button type="button" className="button" onClick={onClick}>{t('reinstallNow')}</button>
+        <button
+          type="button"
+          className="button"
+          onClick={onClick}
+          data-automation-id="reinstall-button"
+        >
+          {t('reinstallNow')}
+        </button>
       </Inputs>
     </>
   );
diff --git a/assets/js/src/settings/pages/advanced/share_data.tsx b/assets/js/src/settings/pages/advanced/share_data.tsx
index 1aa2404d92..36a645f6a1 100644
--- a/assets/js/src/settings/pages/advanced/share_data.tsx
+++ b/assets/js/src/settings/pages/advanced/share_data.tsx
@@ -24,7 +24,7 @@ export default function ShareData() {
               {t('readMore')}
             </a>
           </>
-)}
+        )}
         htmlFor=""
       />
       <Inputs>
@@ -34,6 +34,7 @@ export default function ShareData() {
           value="1"
           checked={enabled === '1'}
           onChange={onChange(setEnabled)}
+          data-automation-id="analytics-yes"
         />
         <label htmlFor="share-data-enabled">
           {t('yes')}
@@ -45,6 +46,7 @@ export default function ShareData() {
           value=""
           checked={enabled === ''}
           onChange={onChange(setEnabled)}
+          data-automation-id="analytics-no"
         />
         <label htmlFor="share-data-disabled">
           {t('no')}
diff --git a/assets/js/src/settings/pages/advanced/task_scheduler.tsx b/assets/js/src/settings/pages/advanced/task_scheduler.tsx
index 6ae3f01983..9d28a5fc79 100644
--- a/assets/js/src/settings/pages/advanced/task_scheduler.tsx
+++ b/assets/js/src/settings/pages/advanced/task_scheduler.tsx
@@ -36,6 +36,7 @@ export default function TaskScheduler() {
           value="WordPress"
           checked={method === 'WordPress'}
           onChange={onChange(setMethod)}
+          data-automation-id="wordress_cron_radio"
         />
         <label htmlFor="cron_trigger-method-wordpress">
           {t('websiteVisitors')}
@@ -47,6 +48,7 @@ export default function TaskScheduler() {
           value="MailPoet"
           checked={method === 'MailPoet'}
           onChange={onChange(setMethod)}
+          data-automation-id="mailpoet_cron_radio"
         />
         <label htmlFor="cron_trigger-method-mailpoet">
           {ReactStringReplace(t('mailpoetScript'),
@@ -70,6 +72,7 @@ export default function TaskScheduler() {
           value="Linux Cron"
           checked={method === 'Linux Cron'}
           onChange={onChange(setMethod)}
+          data-automation-id="linux_cron_radio"
         />
         <label htmlFor="cron_trigger-method-cron">
           {t('serverCron')}
diff --git a/assets/js/src/settings/pages/advanced/tracking.tsx b/assets/js/src/settings/pages/advanced/tracking.tsx
index 06265267fb..1b5e91730d 100644
--- a/assets/js/src/settings/pages/advanced/tracking.tsx
+++ b/assets/js/src/settings/pages/advanced/tracking.tsx
@@ -21,6 +21,7 @@ export default function Tracking() {
           value="1"
           checked={enabled === '1'}
           onChange={onChange(setEnabled)}
+          data-automation-id="tracking-enabled-radio"
         />
         <label htmlFor="tracking-enabled">
           {t('yes')}
@@ -32,6 +33,7 @@ export default function Tracking() {
           value=""
           checked={enabled === ''}
           onChange={onChange(setEnabled)}
+          data-automation-id="tracking-disabled-radio"
         />
         <label htmlFor="tracking-disabled">
           {t('no')}
diff --git a/tests/acceptance/AdvancedSettingsCest.php b/tests/acceptance/AdvancedSettingsCest.php
index be386fcffd..0f54d491fe 100644
--- a/tests/acceptance/AdvancedSettingsCest.php
+++ b/tests/acceptance/AdvancedSettingsCest.php
@@ -12,39 +12,17 @@ class AdvancedSettingsCest {
     $i->login();
     $i->amOnMailPoetPage('Settings');
     $i->click('[data-automation-id="settings-advanced-tab"]');
-    $i->waitForText('Bounce email address');
-    $i->selectOption($noAnonymousData, 'No');
+    $i->waitForElement($noAnonymousData);
+    $i->click($noAnonymousData);
     //save + refresh
     $i->click($submitButton);
     $i->waitForText($successMessage);
-    $i->seeOptionIsSelected($noAnonymousData, 'No');
+    $i->seeCheckboxIsChecked($noAnonymousData);
     //repeat for Yes
-    $i->selectOption($yesAnonymousData, 'Yes');
+    $i->click($yesAnonymousData);
     $i->click($submitButton);
     $i->waitForText($successMessage);
-    $i->seeOptionIsSelected($yesAnonymousData, 'Yes');
-  }
-
-  public function addBounceEmailAddress(\AcceptanceTester $i) {
-    $i->wantTo('Add a bounce email address on Advanced Settings page');
-    $bounceAddressField = '[data-automation-id="bounce-address-field"]';
-    $bounceAddressText = 'bounce@bounce.bounce';
-    $submitButton = '[data-automation-id="settings-submit-button"]';
-    $successMessage = "Settings saved";
-    $i->login();
-    $i->amOnMailPoetPage('Settings');
-    $i->click('[data-automation-id="settings-advanced-tab"]');
-    $i->waitForElement($bounceAddressField);
-    $i->fillField($bounceAddressField, $bounceAddressText);
-    $i->click($submitButton);
-    $i->waitForText($successMessage);
-    $i->waitForElement($bounceAddressField);
-    //check System Info to make sure the value changed in db
-    $i->amOnMailPoetPage('Help');
-    $i->waitForText('Knowledge Base');
-    $i->click('System Info');
-    $i->waitForText('The information below is useful');
-    $i->waitForText($bounceAddressText);
+    $i->seeCheckboxIsChecked($yesAnonymousData);
   }
 
   public function toggleTaskScheduler(\AcceptanceTester $i) {
@@ -55,18 +33,17 @@ class AdvancedSettingsCest {
     $systemInfoWordPressCron = "Task Scheduler method: WordPress";
     $systemInfoMailPoetCron = "Task Scheduler method: MailPoet";
     $systemInfoLinuxCron = "Task Scheduler method: Linux Cron";
-    $bounceAddressField = '[data-automation-id="bounce-address-field"]';
     $submitButton = '[data-automation-id="settings-submit-button"]';
     $successMessage = "Settings saved";
     //switch to MailPoet cron
     $i->login();
     $i->amOnMailPoetPage('Settings');
     $i->click('[data-automation-id="settings-advanced-tab"]');
-    $i->waitForElement($bounceAddressField);
+    $i->waitForElement($chooseMailPoetCron);
     $i->click($chooseMailPoetCron);
     $i->click($submitButton);
     $i->waitForText($successMessage);
-    $i->waitForElement($bounceAddressField);
+    $i->waitForElement($chooseMailPoetCron);
     //check System Info to make sure the value changed
     $i->amOnMailPoetPage('Help');
     $i->waitForText('Knowledge Base');
@@ -76,11 +53,11 @@ class AdvancedSettingsCest {
     //switch to linux cron
     $i->amOnMailPoetPage('Settings');
     $i->click('[data-automation-id="settings-advanced-tab"]');
-    $i->waitForElement($bounceAddressField);
+    $i->waitForElement($chooseLinuxCron);
     $i->click($chooseLinuxCron);
     $i->click($submitButton);
     $i->waitForText($successMessage);
-    $i->waitForElement($bounceAddressField);
+    $i->waitForElement($chooseLinuxCron);
     //check System Info to make sure the value changed
     $i->amOnMailPoetPage('Help');
     $i->waitForText('Knowledge Base');
@@ -90,11 +67,11 @@ class AdvancedSettingsCest {
     //switch to default cron
     $i->amOnMailPoetPage('Settings');
     $i->click('[data-automation-id="settings-advanced-tab"]');
-    $i->waitForElement($bounceAddressField);
+    $i->waitForElement($chooseWordPressCron);
     $i->click($chooseWordPressCron);
     $i->click($submitButton);
     $i->waitForText($successMessage);
-    $i->waitForElement($bounceAddressField);
+    $i->waitForElement($chooseWordPressCron);
     //check System Info to make sure the value changed
     $i->amOnMailPoetPage('Help');
     $i->waitForText('Knowledge Base');
@@ -143,9 +120,12 @@ class AdvancedSettingsCest {
   public function checkInactiveSubscribers(\AcceptanceTester $i) {
     $i->wantTo('Check that inactive subsribers has default value');
     $inactiveSubscribersDefault = '[data-automation-id="inactive-subscribers-default"]';
+    $trackingEnabled = '[data-automation-id="tracking-enabled-radio"]';
     $i->login();
     $i->amOnMailPoetPage('Settings');
     $i->click('[data-automation-id="settings-advanced-tab"]');
+    $i->waitForElement($trackingEnabled);
+    $i->click($trackingEnabled);
     $i->waitForElement($inactiveSubscribersDefault);
     $i->seeCheckboxIsChecked($inactiveSubscribersDefault);
 
diff --git a/tests/acceptance/ReinstallFromScratchCest.php b/tests/acceptance/ReinstallFromScratchCest.php
index 9d2e54e6f2..daff6dac9f 100644
--- a/tests/acceptance/ReinstallFromScratchCest.php
+++ b/tests/acceptance/ReinstallFromScratchCest.php
@@ -30,7 +30,7 @@ class ReinstallFromScratchCest {
 
     // Step 2 - reinstall from scratch
     $i->amOnPage('/wp-admin/admin.php?page=mailpoet-settings#advanced');
-    $i->waitForElement('#mailpoet_reinstall');
+    $i->waitForElement('[data-automation-id="reinstall-button"]');
     $i->click('Reinstall now...');
     $i->acceptPopup();
     $i->waitForText('Welcome! Let’s get you started on the right foot.');
diff --git a/tests/acceptance/SettingsInactiveSubscribersChangeCest.php b/tests/acceptance/SettingsInactiveSubscribersChangeCest.php
index 5286de0ee5..05f80378fb 100644
--- a/tests/acceptance/SettingsInactiveSubscribersChangeCest.php
+++ b/tests/acceptance/SettingsInactiveSubscribersChangeCest.php
@@ -36,7 +36,7 @@ class SettingsInactiveSubscribersChangeCest {
     $i->login();
     $i->amOnMailPoetPage('Settings');
     $i->click('[data-automation-id="settings-advanced-tab"]');
-    $i->waitForElement('[data-automation-id="inactive-subscribers-enabled"]');
+    $i->waitForElement('[data-automation-id="inactive-subscribers-option-never"]');
     $i->click('[data-automation-id="inactive-subscribers-option-never"]');
     $i->click('[data-automation-id="settings-submit-button"]');
     $i->waitForText('Settings saved');
diff --git a/tests/acceptance/SettingsPageBasicsCest.php b/tests/acceptance/SettingsPageBasicsCest.php
index 4cb3e10c8c..e870e345b9 100644
--- a/tests/acceptance/SettingsPageBasicsCest.php
+++ b/tests/acceptance/SettingsPageBasicsCest.php
@@ -23,7 +23,7 @@ class SettingsPageBasicsCest {
     $i->seeNoJSErrors();
     //Advanced Tab
     $i->click('[data-automation-id="settings-advanced-tab"]');
-    $i->waitForText('Bounce email address');
+    $i->waitForText('Newsletter task scheduler');
     $i->seeNoJSErrors();
     //Activation Key Tab
     $i->click('[data-automation-id="activation_settings_tab"]');