diff --git a/src/components/searchbar/test/basic/e2e.ts b/src/components/searchbar/test/basic/e2e.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/components/searchbar/test/floating/index.ts b/src/components/searchbar/test/basic/index.ts
similarity index 100%
rename from src/components/searchbar/test/floating/index.ts
rename to src/components/searchbar/test/basic/index.ts
diff --git a/src/components/searchbar/test/floating/main.html b/src/components/searchbar/test/basic/main.html
similarity index 74%
rename from src/components/searchbar/test/floating/main.html
rename to src/components/searchbar/test/basic/main.html
index bd598fc1125..9497f54e450 100644
--- a/src/components/searchbar/test/floating/main.html
+++ b/src/components/searchbar/test/basic/main.html
@@ -1,30 +1,30 @@
 <ion-content>
   <h5 padding-left> Search - Default </h5>
-  <ion-searchbar [(ngModel)]="defaultSearch" showCancelButton debounce="500" (ionInput)="triggerInput($event)" (ionBlur)="inputBlurred($event)" (ionFocus)="inputFocused($event)" (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)" class="e2eDefaultFloatingSearchbar"></ion-searchbar>
+  <ion-searchbar [(ngModel)]="defaultSearch" showCancelButton debounce="500" (ionInput)="triggerInput($event)" (ionBlur)="inputBlurred($event)" (ionFocus)="inputFocused($event)" (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)"></ion-searchbar>
 
   <p padding-left>
     defaultSearch: <b>{{ defaultSearch }}</b>
   </p>
 
   <h5 padding-left> Search - Custom Placeholder </h5>
-  <ion-searchbar [autocorrect]="isAutocorrect" showCancelButton="true" [autocomplete]="isAutocomplete" [spellcheck]="isSpellcheck" type="number" [(ngModel)]="customPlaceholder" (ionInput)="triggerInput($event)" (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)" placeholder="Filter Schedules" class="e2eCustomPlaceholderFloatingSearchbar"></ion-searchbar>
+  <ion-searchbar [autocorrect]="isAutocorrect" showCancelButton="true" [autocomplete]="isAutocomplete" [spellcheck]="isSpellcheck" type="number" [(ngModel)]="customPlaceholder" (ionInput)="triggerInput($event)" (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)" placeholder="Filter Schedules"></ion-searchbar>
 
   <p padding-left>
     customPlaceholder: <b>{{ customPlaceholder }}</b>
   </p>
 
   <h5 padding-left> Search - No Cancel Button </h5>
-  <ion-searchbar autocorrect="off" autocomplete="off" spellcheck="true" type="text" [(ngModel)]="defaultCancel" (ionInput)="triggerInput($event)" (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)" class="e2eDefaultCancelButtonFloatingSearchbar"></ion-searchbar>
+  <ion-searchbar autocorrect="off" autocomplete="off" spellcheck="true" type="text" [(ngModel)]="defaultCancel" (ionInput)="triggerInput($event)" (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)"></ion-searchbar>
 
   <p padding-left>
     defaultCancel: <b>{{ defaultCancel }}</b>
   </p>
 
   <h5 padding-left> Search - Custom Cancel Button Danger </h5>
-  <ion-searchbar (ionInput)="triggerInput($event)" showCancelButton (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)" cancelButtonText="Really Long Cancel" class="e2eCustomCancelButtonFloatingSearchbar" danger></ion-searchbar>
+  <ion-searchbar (ionInput)="triggerInput($event)" showCancelButton (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)" cancelButtonText="Really Long Cancel" danger></ion-searchbar>
 
   <h5 padding-left> Search - Value passed </h5>
-  <ion-searchbar value="mysearch" showCancelButton (ionInput)="triggerInput($event)" (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)" cancelButtonText="Really Long Cancel" class="e2eCustomCancelButtonFloatingSearchbar" danger></ion-searchbar>
+  <ion-searchbar value="mysearch" showCancelButton (ionInput)="triggerInput($event)" (ionCancel)="onCancelSearchbar($event)" (ionClear)="onClearSearchbar($event)" cancelButtonText="Really Long Cancel" dark></ion-searchbar>
 
   <p padding>
     <button block (click)="changeValue()">Change Value</button>
diff --git a/src/components/searchbar/test/floating/e2e.ts b/src/components/searchbar/test/floating/e2e.ts
deleted file mode 100644
index 13a8a1e23b6..00000000000
--- a/src/components/searchbar/test/floating/e2e.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-
-it('default should focus', function() {
-  element(by.css('.e2eDefaultFloatingSearchbar input')).sendKeys("AA");
-});
-
-it('hide cancel button should focus', function() {
-  element(by.css('.e2eDefaultCancelButtonFloatingSearchbar input')).sendKeys("CC");
-});
-
-it('custom cancel button should focus', function() {
-  element(by.css('.e2eCustomCancelButtonFloatingSearchbar input')).sendKeys("DD");
-});
-
-// TODO - this test will work on iOS but fail on Android
-// it('custom cancel action should alert', function() {
-//   element(by.css('.e2eCustomCancelActionFloatingSearchbar .searchbar-ios-cancel')).click();
-// });
diff --git a/src/components/searchbar/test/nav/e2e.ts b/src/components/searchbar/test/nav/e2e.ts
new file mode 100644
index 00000000000..07fecbd745f
--- /dev/null
+++ b/src/components/searchbar/test/nav/e2e.ts
@@ -0,0 +1,4 @@
+
+it('should navigate to searchbar', function() {
+  element(by.css('.e2eSearchbarNav')).click();
+});
diff --git a/src/components/searchbar/test/nav/first.html b/src/components/searchbar/test/nav/first.html
index a44f3c3861d..fe0c7f79489 100644
--- a/src/components/searchbar/test/nav/first.html
+++ b/src/components/searchbar/test/nav/first.html
@@ -3,5 +3,5 @@
 </ion-navbar>
 
 <ion-content padding>
-  <button block (click)="goToSecond()">Go to Searchbar Page</button>
+  <button block (click)="goToSecond()" class="e2eSearchbarNav">Go to Searchbar Page</button>
 </ion-content>
diff --git a/src/components/searchbar/test/toolbar/e2e.ts b/src/components/searchbar/test/toolbar/e2e.ts
index 5e071a52345..e69de29bb2d 100644
--- a/src/components/searchbar/test/toolbar/e2e.ts
+++ b/src/components/searchbar/test/toolbar/e2e.ts
@@ -1,16 +0,0 @@
-
-it('default should focus', function() {
-  element(by.css('.e2eDefaultToolbarSearchbar input')).sendKeys("AA");
-});
-
-it('primary should focus', function() {
-  element(by.css('.e2ePrimaryToolbarSearchbar input')).sendKeys("BB");
-});
-
-it('danger should focus', function() {
-  element(by.css('.e2eDarkToolbarSearchbar input')).sendKeys("CC");
-});
-
-it('light should focus', function() {
-  element(by.css('.e2eLightToolbarSearchbar input')).sendKeys("DD");
-});
diff --git a/src/components/searchbar/test/toolbar/main.html b/src/components/searchbar/test/toolbar/main.html
index 7a401042129..1ffcd784728 100644
--- a/src/components/searchbar/test/toolbar/main.html
+++ b/src/components/searchbar/test/toolbar/main.html
@@ -5,22 +5,22 @@
 <ion-content>
   <h5 padding-left padding-top> Search - Default Toolbar </h5>
   <ion-toolbar>
-    <ion-searchbar [(ngModel)]="defaultToolbarSearch" class="e2eDefaultToolbarSearchbar"></ion-searchbar>
+    <ion-searchbar [(ngModel)]="defaultToolbarSearch"></ion-searchbar>
   </ion-toolbar>
 
   <h5 padding-left padding-top> Search - Primary Toolbar </h5>
   <ion-toolbar primary>
-    <ion-searchbar dark [(ngModel)]="primaryToolbarSearch" showCancelButton class="e2ePrimaryToolbarSearchbar"></ion-searchbar>
+    <ion-searchbar dark [(ngModel)]="primaryToolbarSearch" showCancelButton></ion-searchbar>
   </ion-toolbar>
 
   <h5 padding-left padding-top> Search - Dark Toolbar </h5>
   <ion-toolbar dark>
-    <ion-searchbar dark [(ngModel)]="darkToolbarSearch" class="e2eDarkToolbarSearchbar"></ion-searchbar>
+    <ion-searchbar dark placeholder="Filter Schedules" [(ngModel)]="darkToolbarSearch"></ion-searchbar>
   </ion-toolbar>
 
   <h5 padding-left padding-top> Search - Light Toolbar </h5>
   <ion-toolbar light>
-    <ion-searchbar [(ngModel)]="lightToolbarSearch" showCancelButton class="e2eLightToolbarSearchbar"></ion-searchbar>
+    <ion-searchbar [(ngModel)]="lightToolbarSearch" showCancelButton></ion-searchbar>
   </ion-toolbar>
 
 </ion-content>