diff --git a/src/components/tabs/test/basic/main.html b/src/components/tabs/test/basic/main.html
index 8732460089..12d69d2cf3 100644
--- a/src/components/tabs/test/basic/main.html
+++ b/src/components/tabs/test/basic/main.html
@@ -1,15 +1,20 @@
 
-<ion-view>
+<ion-tabs>
 
-  <ion-tabs>
+  <ion-tab tab-title="Tab 1">
+    <ion-view nav-title="Tab 1">
+      <ion-content class="padding">
+        Tab 1 Content
+      </ion-content>
+    </ion-view>
+  </ion-tab>
 
-    <ion-tab tab-title="Tab 1">
-      Tab 1 Content<br/>.
-    </ion-tab>
-    <ion-tab tab-title="Tab 2">
-      .<br/>Tab 2 Content
-    </ion-tab>
+  <ion-tab tab-title="Tab 2">
+    <ion-view nav-title="Tab 2">
+      <ion-content class="padding">
+        Tab 2 Content
+      </ion-content>
+    </ion-view>
+  </ion-tab>
 
-  </ion-tabs>
-
-</ion-view>
+</ion-tabs>
diff --git a/src/components/tabs/test/tab-bar-bottom/main.html b/src/components/tabs/test/tab-bar-bottom/main.html
index e3b8a5eaab..9f44e5d8ed 100644
--- a/src/components/tabs/test/tab-bar-bottom/main.html
+++ b/src/components/tabs/test/tab-bar-bottom/main.html
@@ -2,15 +2,20 @@
 <ion-tabs placement="bottom">
 
   <ion-tab tab-title="Tab 1">
-    <ion-view>
-      Tab 1 Content
+    <ion-view nav-title="Tab 1">
+      <ion-content class="padding">
+        Tab 1 Content
+      </ion-content>
     </ion-view>
   </ion-tab>
 
   <ion-tab tab-title="Tab 2">
-    <ion-view>
-      Tab 2 Content
+    <ion-view nav-title="Tab 2">
+      <ion-content class="padding">
+        Tab 2 Content
+      </ion-content>
     </ion-view>
   </ion-tab>
 
 </ion-tabs>
+
diff --git a/src/components/tabs/test/tab-bar-icons/main.html b/src/components/tabs/test/tab-bar-icons/main.html
index 331c5d717d..9f8e5e1447 100644
--- a/src/components/tabs/test/tab-bar-icons/main.html
+++ b/src/components/tabs/test/tab-bar-icons/main.html
@@ -2,8 +2,8 @@
 <div style="margin: 4px 0">
 
   <h6>Icon Top of Text (Default)</h6>
-  <div class="toolbar tab-bar toolbar-ios toolbar-bottom">
-    <div class="tab-bar-container">
+  <div class="tab-bar-container toolbar-ios">
+    <div class="tab-bar">
       <a class="tab-bar-item tab-active">
         <icon class="tab-bar-item-icon ion-home"></icon>
         <span class="tab-bar-item-text">Home</span>
@@ -20,8 +20,8 @@
   </div>
 
   <h6>Icon Bottom of Text</h6>
-  <div class="toolbar tab-bar toolbar-ios toolbar-bottom">
-    <div class="tab-bar-container tab-bar-icon-bottom">
+  <div class="tab-bar-container toolbar-ios">
+    <div class="tab-bar tab-bar-icon-bottom">
       <a class="tab-bar-item tab-active">
         <icon class="tab-bar-item-icon ion-home"></icon>
         <span class="tab-bar-item-text">Home</span>
@@ -38,8 +38,8 @@
   </div>
 
   <h6>Icon Left of Text</h6>
-  <div class="toolbar tab-bar toolbar-ios toolbar-bottom">
-    <div class="tab-bar-container tab-bar-icon-left">
+  <div class="tab-bar-container toolbar-ios">
+    <div class="tab-bar tab-bar-icon-left">
       <a class="tab-bar-item tab-active">
         <icon class="tab-bar-item-icon ion-home"></icon>
         <span class="tab-bar-item-text">Home</span>
@@ -56,8 +56,8 @@
   </div>
 
   <h6>Icon Right of Text</h6>
-  <div class="toolbar tab-bar toolbar-ios toolbar-bottom">
-    <div class="tab-bar-container tab-bar-icon-right">
+  <div class="tab-bar-container toolbar-ios">
+    <div class="tab-bar tab-bar-icon-right">
       <a class="tab-bar-item tab-active">
         <icon class="tab-bar-item-icon ion-home"></icon>
         <span class="tab-bar-item-text">Home</span>
@@ -74,8 +74,8 @@
   </div>
 
   <h6>Icon Only</h6>
-  <div class="toolbar tab-bar toolbar-ios toolbar-bottom">
-    <div class="tab-bar-container tab-bar-icon-only">
+  <div class="tab-bar-container toolbar-ios">
+    <div class="tab-bar tab-bar-icon-only">
       <a class="tab-bar-item tab-active">
         <icon class="tab-bar-item-icon ion-home"></icon>
         <span class="tab-bar-item-text">Home</span>
@@ -92,8 +92,8 @@
   </div>
 
   <h6>Text Only</h6>
-  <div class="toolbar tab-bar toolbar-ios toolbar-bottom">
-    <div class="tab-bar-container tab-bar-text-only">
+  <div class="tab-bar-container toolbar-ios">
+    <div class="tab-bar tab-bar-text-only">
       <a class="tab-bar-item tab-active">
         <icon class="tab-bar-item-icon ion-home"></icon>
         <span class="tab-bar-item-text">Home</span>
diff --git a/src/components/tabs/test/tab-bar-top/main.html b/src/components/tabs/test/tab-bar-top/main.html
index 1240876476..51294f22b0 100644
--- a/src/components/tabs/test/tab-bar-top/main.html
+++ b/src/components/tabs/test/tab-bar-top/main.html
@@ -3,14 +3,19 @@
 
   <ion-tab tab-title="Tab 1">
     <ion-view nav-title="Tab 1">
-      Tab 1 Content
+      <ion-content class="padding">
+        Tab 1 Content
+      </ion-content>
     </ion-view>
   </ion-tab>
 
   <ion-tab tab-title="Tab 2">
     <ion-view nav-title="Tab 2">
-      Tab 2 Content
+      <ion-content class="padding">
+        Tab 2 Content
+      </ion-content>
     </ion-view>
   </ion-tab>
 
 </ion-tabs>
+