diff --git a/assets/js/src/segments/tabs.tsx b/assets/js/src/segments/tabs.tsx
index cd95bd8cf2..ee53f4b85a 100644
--- a/assets/js/src/segments/tabs.tsx
+++ b/assets/js/src/segments/tabs.tsx
@@ -17,6 +17,7 @@ export default () => {
       </Link>
       <Link
         to="/segments"
+        data-automation-id="dynamic-segments-tab"
         className={classnames('nav-tab', { 'nav-tab-active': current === 'segments' })}
       >
         {MailPoet.I18n.t('pageTitleSegments')}
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 95883d61cd..36c43e4720 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -91,8 +91,6 @@ class AcceptanceTester extends \Codeception\Actor {
       $path = 'newsletters';
     } elseif ($page === 'Lists') {
       $path = 'segments';
-    } elseif ($page === 'Segments') {
-      $path = 'dynamic-segments';
     } else {
       $path = strtolower($page);
     }
diff --git a/tests/acceptance/CreateNewSegmentCest.php b/tests/acceptance/CreateNewSegmentCest.php
index 370ba8e532..3db893cc30 100644
--- a/tests/acceptance/CreateNewSegmentCest.php
+++ b/tests/acceptance/CreateNewSegmentCest.php
@@ -9,16 +9,17 @@ class CreateNewSegmentCest {
     $i->wantTo('Create a new WP user role segment');
     $segmentTitle = 'Create User Role Segment Test';
     $i->login();
-    $i->amOnMailpoetPage('Segments');
+    $i->amOnMailpoetPage('Lists');
     $i->click('[data-automation-id="new-segment"]');
-    $i->seeInCurrentUrl('#/new');
     $i->fillField(['name' => 'name'], $segmentTitle);
     $i->fillField(['name' => 'description'], 'Lorem ipsum dolor amed');
     $i->selectOption('form select[name=segmentType]', 'WordPress user roles');
     $i->selectOption('form select[name=wordpressRole]', 'Editor');
     $i->click('Save');
-    $i->amOnMailpoetPage('Segments');
-    $i->waitForText($segmentTitle, 20);
+    $i->amOnMailpoetPage('Lists');
+    $i->waitForElement('[data-automation-id="dynamic-segments-tab"]');
+    $i->click('[data-automation-id="dynamic-segments-tab"]');
+    $i->waitForText($segmentTitle);
   }
 
   public function createEmailSegment(\AcceptanceTester $i) {
@@ -28,9 +29,8 @@ class CreateNewSegmentCest {
     $newsletterFactory->withSubject($emailSubject)->create();
     $segmentTitle = 'Create Email Segment Test';
     $i->login();
-    $i->amOnMailpoetPage('Segments');
+    $i->amOnMailpoetPage('Lists');
     $i->click('[data-automation-id="new-segment"]');
-    $i->seeInCurrentUrl('#/new');
     $i->fillField(['name' => 'name'], $segmentTitle);
     $i->fillField(['name' => 'description'], 'Lorem ipsum dolor amed');
     $i->selectOption('form select[name=segmentType]', 'Email');
@@ -38,7 +38,9 @@ class CreateNewSegmentCest {
     $i->click('#select2-newsletter_id-container');
     $i->selectOptionInSelect2($emailSubject);
     $i->click('Save');
-    $i->amOnMailpoetPage('Segments');
+    $i->amOnMailpoetPage('Lists');
+    $i->waitForElement('[data-automation-id="dynamic-segments-tab"]');
+    $i->click('[data-automation-id="dynamic-segments-tab"]');
     $i->waitForText($segmentTitle, 20);
   }
 }
diff --git a/tests/acceptance/DeleteTrashedSegmentCest.php b/tests/acceptance/DeleteTrashedSegmentCest.php
index d9b221a136..84a75ef4df 100644
--- a/tests/acceptance/DeleteTrashedSegmentCest.php
+++ b/tests/acceptance/DeleteTrashedSegmentCest.php
@@ -19,7 +19,9 @@ class DeleteTrashedSegmentCest {
     $listingAutomationSelector = '[data-automation-id="listing_item_' . $segment->id . '"]';
 
     $i->login();
-    $i->amOnMailpoetPage('Segments');
+    $i->amOnMailpoetPage('Lists');
+    $i->waitForElement('[data-automation-id="dynamic-segments-tab"]');
+    $i->click('[data-automation-id="dynamic-segments-tab"]');
     $i->waitForElement('[data-automation-id="filters_trash"]', 10);
     $i->click('[data-automation-id="filters_trash"]');
     $i->waitForText($segmentTitle, 10, $listingAutomationSelector);
diff --git a/tests/acceptance/EditExistingSegmentCest.php b/tests/acceptance/EditExistingSegmentCest.php
index 549738b09b..29f4831445 100644
--- a/tests/acceptance/EditExistingSegmentCest.php
+++ b/tests/acceptance/EditExistingSegmentCest.php
@@ -18,18 +18,22 @@ class EditExistingSegmentCest {
       ->create();
 
     $i->login();
-    $i->amOnMailpoetPage('Segments');
+    $i->amOnMailpoetPage('Lists');
+    $i->waitForElement('[data-automation-id="dynamic-segments-tab"]');
+    $i->click('[data-automation-id="dynamic-segments-tab"]');
     $listingAutomationSelector = '[data-automation-id="listing_item_' . $segment->id . '"]';
     $i->waitForText($segmentTitle, 10, $listingAutomationSelector);
     $i->clickItemRowActionByItemName($segmentTitle, 'Edit');
 
-    $i->seeInCurrentUrl('mailpoet-dynamic-segments#/edit/' . $segment->id);
     $i->waitForElementNotVisible('.mailpoet_form_loading');
     $i->fillField(['name' => 'name'], $segmentEditedTitle);
     $i->fillField(['name' => 'description'], 'Lorem ipsum dolor amed edited');
     $i->selectOption('form select[name=segmentType]', 'WordPress user roles');
     $i->selectOption('form select[name=wordpressRole]', 'Editor');
     $i->click('Save');
+    $i->amOnMailpoetPage('Lists');
+    $i->waitForElement('[data-automation-id="dynamic-segments-tab"]');
+    $i->click('[data-automation-id="dynamic-segments-tab"]');
 
     $i->waitForText($segmentEditedTitle, 20, $listingAutomationSelector);
     $i->seeNoJSErrors();
diff --git a/tests/acceptance/RestoreTrashedSegmentCest.php b/tests/acceptance/RestoreTrashedSegmentCest.php
index c6dbd4c019..e185e5749b 100644
--- a/tests/acceptance/RestoreTrashedSegmentCest.php
+++ b/tests/acceptance/RestoreTrashedSegmentCest.php
@@ -19,7 +19,10 @@ class RestoreTrashedSegmentCest {
     $listingAutomationSelector = '[data-automation-id="listing_item_' . $segment->id . '"]';
 
     $i->login();
-    $i->amOnMailpoetPage('Segments');
+    $i->amOnMailpoetPage('Lists');
+    $i->waitForElement('[data-automation-id="dynamic-segments-tab"]');
+    $i->click('[data-automation-id="dynamic-segments-tab"]');
+
     $i->waitForElement('[data-automation-id="filters_trash"]', 10);
     $i->click('[data-automation-id="filters_trash"]');
     $i->waitForText($segmentTitle, 10, $listingAutomationSelector);
diff --git a/tests/acceptance/TrashExistingSegmentCest.php b/tests/acceptance/TrashExistingSegmentCest.php
index 8e6e6ce318..a7d0d366df 100644
--- a/tests/acceptance/TrashExistingSegmentCest.php
+++ b/tests/acceptance/TrashExistingSegmentCest.php
@@ -23,7 +23,9 @@ class TrashExistingSegmentCest {
       ->create();
 
     $i->login();
-    $i->amOnMailpoetPage('Segments');
+    $i->amOnMailpoetPage('Lists');
+    $i->waitForElement('[data-automation-id="dynamic-segments-tab"]');
+    $i->click('[data-automation-id="dynamic-segments-tab"]');
     $listingAutomationSelector = '[data-automation-id="listing_item_' . $segment->id . '"]';
     $i->waitForText($segmentTitle, 10, $listingAutomationSelector);
     $i->clickItemRowActionByItemName($segmentTitle, 'Move to trash');
diff --git a/tests/acceptance/ViewSegmentSubscribersCest.php b/tests/acceptance/ViewSegmentSubscribersCest.php
index 7b0ae4a7e8..e714a60622 100644
--- a/tests/acceptance/ViewSegmentSubscribersCest.php
+++ b/tests/acceptance/ViewSegmentSubscribersCest.php
@@ -30,7 +30,9 @@ class ViewSegmentSubscribersCest {
       ->create();
 
     $i->login();
-    $i->amOnMailpoetPage('Segments');
+    $i->amOnMailpoetPage('Lists');
+    $i->waitForElement('[data-automation-id="dynamic-segments-tab"]');
+    $i->click('[data-automation-id="dynamic-segments-tab"]');
     $listingAutomationSelector = '[data-automation-id="listing_item_' . $segment->id . '"]';
     $i->waitForText($segmentTitle, 10, $listingAutomationSelector);
     $i->clickItemRowActionByItemName($segmentTitle, 'View Subscribers');