diff --git a/core/src/components/segment-view/test/basic/index.html b/core/src/components/segment-view/test/basic/index.html
index 43a2d75653..0eefd5a547 100644
--- a/core/src/components/segment-view/test/basic/index.html
+++ b/core/src/components/segment-view/test/basic/index.html
@@ -47,49 +47,43 @@
       </ion-header>
 
       <ion-content>
-        <ion-toolbar>
-          <ion-segment id="noValueSegment">
-            <ion-segment-button content-id="no" value="no">
-              <ion-label>No</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="value" value="value">
-              <ion-label>Value</ion-label>
-            </ion-segment-button>
-          </ion-segment>
-        </ion-toolbar>
+        <ion-segment id="noValueSegment">
+          <ion-segment-button content-id="no" value="no">
+            <ion-label>No</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="value" value="value">
+            <ion-label>Value</ion-label>
+          </ion-segment-button>
+        </ion-segment>
         <ion-segment-view id="noValueSegmentView">
           <ion-segment-content id="no">No</ion-segment-content>
           <ion-segment-content id="value">Value</ion-segment-content>
         </ion-segment-view>
 
-        <ion-toolbar>
-          <ion-segment value="all">
-            <ion-segment-button content-id="all" value="all">
-              <ion-label>All</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="favorites" value="favorites">
-              <ion-label>Favorites</ion-label>
-            </ion-segment-button>
-          </ion-segment>
-        </ion-toolbar>
+        <ion-segment value="all">
+          <ion-segment-button content-id="all" value="all">
+            <ion-label>All</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="favorites" value="favorites">
+            <ion-label>Favorites</ion-label>
+          </ion-segment-button>
+        </ion-segment>
         <ion-segment-view>
           <ion-segment-content id="all">All</ion-segment-content>
           <ion-segment-content id="favorites">Favorites</ion-segment-content>
         </ion-segment-view>
 
-        <ion-toolbar>
-          <ion-segment value="free">
-            <ion-segment-button content-id="paid" value="paid">
-              <ion-label>Paid</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="free" value="free">
-              <ion-label>Free</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="top" value="top">
-              <ion-label>Top</ion-label>
-            </ion-segment-button>
-          </ion-segment>
-        </ion-toolbar>
+        <ion-segment value="free">
+          <ion-segment-button content-id="paid" value="paid">
+            <ion-label>Paid</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="free" value="free">
+            <ion-label>Free</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="top" value="top">
+            <ion-label>Top</ion-label>
+          </ion-segment-button>
+        </ion-segment>
         <ion-segment-view>
           <ion-segment-content id="paid">Paid</ion-segment-content>
           <ion-segment-content id="free">Free</ion-segment-content>
diff --git a/core/src/components/segment-view/test/basic/segment-view.e2e.ts b/core/src/components/segment-view/test/basic/segment-view.e2e.ts
index 4644abc207..5d7457743a 100644
--- a/core/src/components/segment-view/test/basic/segment-view.e2e.ts
+++ b/core/src/components/segment-view/test/basic/segment-view.e2e.ts
@@ -9,18 +9,17 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
     test('should show the first content with no initial value', async ({ page }) => {
       await page.setContent(
         `
-          <ion-segment>
-            <ion-segment-button content-id="paid" value="paid">
-              <ion-label>Paid</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="free" value="free">
-              <ion-label>Free</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="top" value="top">
-              <ion-label>Top</ion-label>
-            </ion-segment-button>
-          </ion-segment>
-        </ion-toolbar>
+        <ion-segment>
+          <ion-segment-button content-id="paid" value="paid">
+            <ion-label>Paid</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="free" value="free">
+            <ion-label>Free</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="top" value="top">
+            <ion-label>Top</ion-label>
+          </ion-segment-button>
+        </ion-segment>
         <ion-segment-view>
           <ion-segment-content id="paid">Paid</ion-segment-content>
           <ion-segment-content id="free">Free</ion-segment-content>
@@ -37,18 +36,17 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
     test('should show the content matching the initial value', async ({ page }) => {
       await page.setContent(
         `
-          <ion-segment value="free">
-            <ion-segment-button content-id="paid" value="paid">
-              <ion-label>Paid</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="free" value="free">
-              <ion-label>Free</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="top" value="top">
-              <ion-label>Top</ion-label>
-            </ion-segment-button>
-          </ion-segment>
-        </ion-toolbar>
+        <ion-segment value="free">
+          <ion-segment-button content-id="paid" value="paid">
+            <ion-label>Paid</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="free" value="free">
+            <ion-label>Free</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="top" value="top">
+            <ion-label>Top</ion-label>
+          </ion-segment-button>
+        </ion-segment>
         <ion-segment-view>
           <ion-segment-content id="paid">Paid</ion-segment-content>
           <ion-segment-content id="free">Free</ion-segment-content>
@@ -65,18 +63,17 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
     test('should update the content when changing the value by clicking a segment button', async ({ page }) => {
       await page.setContent(
         `
-          <ion-segment value="free">
-            <ion-segment-button content-id="paid" value="paid">
-              <ion-label>Paid</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="free" value="free">
-              <ion-label>Free</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="top" value="top">
-              <ion-label>Top</ion-label>
-            </ion-segment-button>
-          </ion-segment>
-        </ion-toolbar>
+        <ion-segment value="free">
+          <ion-segment-button content-id="paid" value="paid">
+            <ion-label>Paid</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="free" value="free">
+            <ion-label>Free</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="top" value="top">
+            <ion-label>Top</ion-label>
+          </ion-segment-button>
+        </ion-segment>
         <ion-segment-view>
           <ion-segment-content id="paid">Paid</ion-segment-content>
           <ion-segment-content id="free">Free</ion-segment-content>
diff --git a/core/src/components/segment-view/test/disabled/index.html b/core/src/components/segment-view/test/disabled/index.html
index 59653cf94e..b2e676d34a 100644
--- a/core/src/components/segment-view/test/disabled/index.html
+++ b/core/src/components/segment-view/test/disabled/index.html
@@ -51,38 +51,47 @@
       </ion-header>
 
       <ion-content>
-        <ion-toolbar>
-          <ion-segment value="paid">
-            <ion-segment-button content-id="paid" value="paid">
-              <ion-label>Paid</ion-label>
-            </ion-segment-button>
-            <ion-segment-button disabled content-id="free" value="free">
-              <ion-label>Free</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="top" value="top">
-              <ion-label>Top</ion-label>
-            </ion-segment-button>
-          </ion-segment>
-        </ion-toolbar>
+        <ion-segment>
+          <ion-segment-button disabled content-id="all" value="all">
+            <ion-label>All</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="favorites" value="favorites">
+            <ion-label>Favorites</ion-label>
+          </ion-segment-button>
+        </ion-segment>
+        <ion-segment-view>
+          <ion-segment-content disabled id="all">All</ion-segment-content>
+          <ion-segment-content id="favorites">Favorites</ion-segment-content>
+        </ion-segment-view>
+
+        <ion-segment value="paid">
+          <ion-segment-button content-id="paid" value="paid">
+            <ion-label>Paid</ion-label>
+          </ion-segment-button>
+          <ion-segment-button disabled content-id="free" value="free">
+            <ion-label>Free</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="top" value="top">
+            <ion-label>Top</ion-label>
+          </ion-segment-button>
+        </ion-segment>
         <ion-segment-view>
           <ion-segment-content id="paid">Paid</ion-segment-content>
           <ion-segment-content disabled id="free">Free</ion-segment-content>
           <ion-segment-content id="top">Top</ion-segment-content>
         </ion-segment-view>
 
-        <ion-toolbar>
-          <ion-segment disabled value="reading-list">
-            <ion-segment-button content-id="bookmarks" value="bookmarks">
-              <ion-label>Bookmarks</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="reading-list" value="reading-list">
-              <ion-label>Reading List</ion-label>
-            </ion-segment-button>
-            <ion-segment-button content-id="shared-links" value="shared-links">
-              <ion-label>Shared Links</ion-label>
-            </ion-segment-button>
-          </ion-segment>
-        </ion-toolbar>
+        <ion-segment disabled value="reading-list">
+          <ion-segment-button content-id="bookmarks" value="bookmarks">
+            <ion-label>Bookmarks</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="reading-list" value="reading-list">
+            <ion-label>Reading List</ion-label>
+          </ion-segment-button>
+          <ion-segment-button content-id="shared-links" value="shared-links">
+            <ion-label>Shared Links</ion-label>
+          </ion-segment-button>
+        </ion-segment>
         <ion-segment-view disabled>
           <ion-segment-content id="bookmarks">Bookmarks</ion-segment-content>
           <ion-segment-content id="reading-list">Reading List</ion-segment-content>