diff --git a/CHANGELOG.md b/CHANGELOG.md
index c268aeb811a..f2eca676311 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ No public interface changes since `0.0.10`.
 
 - Fix bug in `Pager` service which occurred when there were no items. [(#237)[https://github.com/elastic/eui/pull/237]]
 - Add `isPageable` method to `Pager` service and set first and last page index to -1 when there are no pages. [(#242)[https://github.com/elastic/eui/pull/242]]
+- Apply additional props to checkbox/switch inputs rather than wrappers. [(#246)](https://github.com/elastic/eui/pull/246)
 
 # [`0.0.9`](https://github.com/elastic/eui/tree/v0.0.9)
 
diff --git a/src/components/form/checkbox/__snapshots__/checkbox.test.js.snap b/src/components/form/checkbox/__snapshots__/checkbox.test.js.snap
index 05f6257c3a1..1776583a99e 100644
--- a/src/components/form/checkbox/__snapshots__/checkbox.test.js.snap
+++ b/src/components/form/checkbox/__snapshots__/checkbox.test.js.snap
@@ -2,12 +2,12 @@
 
 exports[`EuiCheckbox is rendered 1`] = `
 <div
-  aria-label="aria-label"
   class="euiCheckbox testClass1 testClass2"
-  data-test-subj="test subject string"
 >
   <input
+    aria-label="aria-label"
     class="euiCheckbox__input"
+    data-test-subj="test subject string"
     id="id"
     type="checkbox"
   />
diff --git a/src/components/form/checkbox/checkbox.js b/src/components/form/checkbox/checkbox.js
index 451378f617a..1a26a5d7646 100644
--- a/src/components/form/checkbox/checkbox.js
+++ b/src/components/form/checkbox/checkbox.js
@@ -40,7 +40,6 @@ export const EuiCheckbox = ({
   return (
     <div
       className={classes}
-      {...rest}
     >
       <input
         className="euiCheckbox__input"
@@ -49,6 +48,7 @@ export const EuiCheckbox = ({
         checked={checked}
         onChange={onChange}
         disabled={disabled}
+        {...rest}
       />
 
       <div className="euiCheckbox__square">
diff --git a/src/components/form/switch/__snapshots__/switch.test.js.snap b/src/components/form/switch/__snapshots__/switch.test.js.snap
index fcbd1d2fc9b..aab094ef34a 100644
--- a/src/components/form/switch/__snapshots__/switch.test.js.snap
+++ b/src/components/form/switch/__snapshots__/switch.test.js.snap
@@ -2,12 +2,12 @@
 
 exports[`EuiSwitch is rendered 1`] = `
 <div
-  aria-label="aria-label"
   class="euiSwitch testClass1 testClass2"
-  data-test-subj="test subject string"
 >
   <input
+    aria-label="aria-label"
     class="euiSwitch__input"
+    data-test-subj="test subject string"
     type="checkbox"
   />
   <span
diff --git a/src/components/form/switch/switch.js b/src/components/form/switch/switch.js
index 00f0fcfbdf4..f6df648d162 100644
--- a/src/components/form/switch/switch.js
+++ b/src/components/form/switch/switch.js
@@ -17,7 +17,7 @@ export const EuiSwitch = ({
   const classes = classNames('euiSwitch', className);
 
   return (
-    <div className={classes} {...rest}>
+    <div className={classes}>
       <input
         className="euiSwitch__input"
         name={name}
@@ -26,6 +26,7 @@ export const EuiSwitch = ({
         checked={checked}
         disabled={disabled}
         onChange={onChange}
+        {...rest}
       />
 
       <span className="euiSwitch__body">