diff --git a/ionic/components/checkbox/test/basic/e2e.ts b/ionic/components/checkbox/test/basic/e2e.ts
index 74229021d8..3518ab9d8e 100644
--- a/ionic/components/checkbox/test/basic/e2e.ts
+++ b/ionic/components/checkbox/test/basic/e2e.ts
@@ -1,6 +1,6 @@
 
 it('should check apple, enable/check grape, submit form', function() {
-  element(by.css('.e2eAppleCheckbox')).click();
+  element(by.css('[ng-control=appleCtrl] media-checkbox')).click();
   element(by.css('.e2eGrapeDisabled')).click();
   element(by.css('.e2eGrapeChecked')).click();
   element(by.css('.e2eSubmit')).click();
diff --git a/ionic/components/checkbox/test/basic/main.html b/ionic/components/checkbox/test/basic/main.html
index 7285cc2a5d..b34a99b90c 100644
--- a/ionic/components/checkbox/test/basic/main.html
+++ b/ionic/components/checkbox/test/basic/main.html
@@ -8,7 +8,7 @@
 
     <ion-list>
 
-      <ion-checkbox value="apple" checked="true" ng-control="appleCtrl" class="e2eAppleCheckbox">
+      <ion-checkbox value="apple" checked="true" ng-control="appleCtrl">
         Apple, value=apple, init checked
       </ion-checkbox>
 
diff --git a/ionic/components/radio/test/basic/main.html b/ionic/components/radio/test/basic/main.html
index 61e4269885..13bbf16b7d 100644
--- a/ionic/components/radio/test/basic/main.html
+++ b/ionic/components/radio/test/basic/main.html
@@ -16,7 +16,7 @@
         Apple
       </ion-radio>
 
-      <ion-radio value="banana" class="e2eBanana">
+      <ion-radio value="banana">
         Banana
       </ion-radio>
 
diff --git a/ionic/components/switch/test/basic/e2e.ts b/ionic/components/switch/test/basic/e2e.ts
index 467a40500f..9baa3e1550 100644
--- a/ionic/components/switch/test/basic/e2e.ts
+++ b/ionic/components/switch/test/basic/e2e.ts
@@ -1,6 +1,6 @@
 
 it('should check apple via switch element click', function() {
-  element(by.css('.e2eAppleCheckbox media-switch')).click();
+  element(by.css('[ng-control=appleCtrl] media-switch')).click();
 });
 
 
diff --git a/ionic/components/switch/test/basic/main.html b/ionic/components/switch/test/basic/main.html
index 9c15e91767..6e7151425d 100644
--- a/ionic/components/switch/test/basic/main.html
+++ b/ionic/components/switch/test/basic/main.html
@@ -8,7 +8,7 @@
 
     <ion-list>
 
-      <ion-switch value="apple" checked="true" ng-control="appleCtrl" class="e2eAppleCheckbox">
+      <ion-switch value="apple" checked="true" ng-control="appleCtrl">
         Apple, value=apple, init checked
       </ion-switch>