diff --git a/test/markup/scheduler-markup.html b/test/markup/scheduler-markup.html
index 74eff8f20..5cb765c8b 100644
--- a/test/markup/scheduler-markup.html
+++ b/test/markup/scheduler-markup.html
@@ -15,9 +15,9 @@
 							<div class="dropdown-menu dropdown-menu-right datepicker-calendar-wrapper" role="menu">
 								<div class="datepicker-calendar">
 									<div class="datepicker-calendar-header">
-										<button class="prev"><span class="glyphicon glyphicon-chevron-left"></span><span class="sr-only">Previous Month</span></button>
-										<button class="next"><span class="glyphicon glyphicon-chevron-right"></span><span class="sr-only">Next Month</span></button>
-										<button class="title">
+										<button type="button" class="prev"><span class="glyphicon glyphicon-chevron-left"></span><span class="sr-only">Previous Month</span></button>
+										<button type="button" class="next"><span class="glyphicon glyphicon-chevron-right"></span><span class="sr-only">Next Month</span></button>
+										<button type="button" class="title">
 											<span class="month">
 												<span data-month="0">January</span>
 												<span data-month="1">February</span>
@@ -49,25 +49,25 @@
 										<tbody></tbody>
 									</table>
 									<div class="datepicker-calendar-footer">
-										<button class="datepicker-today">Today</button>
+										<button type="button" class="datepicker-today">Today</button>
 									</div>
 								</div>
 								<div class="datepicker-wheels" aria-hidden="true">
 									<div class="datepicker-wheels-month">
 										<h2 class="header">Month</h2>
 										<ul>
-											<li data-month="0"><button>Jan</button></li>
-											<li data-month="1"><button>Feb</button></li>
-											<li data-month="2"><button>Mar</button></li>
-											<li data-month="3"><button>Apr</button></li>
-											<li data-month="4"><button>May</button></li>
-											<li data-month="5"><button>Jun</button></li>
-											<li data-month="6"><button>Jul</button></li>
-											<li data-month="7"><button>Aug</button></li>
-											<li data-month="8"><button>Sep</button></li>
-											<li data-month="9"><button>Oct</button></li>
-											<li data-month="10"><button>Nov</button></li>
-											<li data-month="11"><button>Dec</button></li>
+											<li data-month="0"><button type="button">Jan</button></li>
+											<li data-month="1"><button type="button">Feb</button></li>
+											<li data-month="2"><button type="button">Mar</button></li>
+											<li data-month="3"><button type="button">Apr</button></li>
+											<li data-month="4"><button type="button">May</button></li>
+											<li data-month="5"><button type="button">Jun</button></li>
+											<li data-month="6"><button type="button">Jul</button></li>
+											<li data-month="7"><button type="button">Aug</button></li>
+											<li data-month="8"><button type="button">Sep</button></li>
+											<li data-month="9"><button type="button">Oct</button></li>
+											<li data-month="10"><button type="button">Nov</button></li>
+											<li data-month="11"><button type="button">Dec</button></li>
 										</ul>
 									</div>
 									<div class="datepicker-wheels-year">
@@ -75,7 +75,7 @@ <h2 class="header">Year</h2>
 										<ul></ul>
 									</div>
 									<div class="datepicker-wheels-footer clearfix">
-										<button class="btn datepicker-wheels-back"><span class="glyphicon glyphicon-arrow-left"></span><span class="sr-only">Return to Calendar</span></button>
+										<button type="button" class="btn datepicker-wheels-back"><span class="glyphicon glyphicon-arrow-left"></span><span class="sr-only">Return to Calendar</span></button>
 										<button type="button" class="btn datepicker-wheels-select">Select <span class="sr-only">Month and Year</span></button>
 									</div>
 								</div>
@@ -618,9 +618,9 @@ <h2 class="header">Year</h2>
 							<div class="dropdown-menu dropdown-menu-right datepicker-calendar-wrapper" role="menu">
 								<div class="datepicker-calendar">
 									<div class="datepicker-calendar-header">
-										<button class="prev"><span class="glyphicon glyphicon-chevron-left"></span><span class="sr-only">Previous Month</span></button>
-										<button class="next"><span class="glyphicon glyphicon-chevron-right"></span><span class="sr-only">Next Month</span></button>
-										<button class="title">
+										<button type="button" class="prev"><span class="glyphicon glyphicon-chevron-left"></span><span class="sr-only">Previous Month</span></button>
+										<button type="button" class="next"><span class="glyphicon glyphicon-chevron-right"></span><span class="sr-only">Next Month</span></button>
+										<button type="button" class="title">
 							<span class="month">
 								<span data-month="0">January</span>
 								<span data-month="1">February</span>
@@ -652,25 +652,25 @@ <h2 class="header">Year</h2>
 										<tbody></tbody>
 									</table>
 									<div class="datepicker-calendar-footer">
-										<button class="datepicker-today">Today</button>
+										<button type="button" class="datepicker-today">Today</button>
 									</div>
 								</div>
 								<div class="datepicker-wheels" aria-hidden="true">
 									<div class="datepicker-wheels-month">
 										<h2 class="header">Month</h2>
 										<ul>
-											<li data-month="0"><button>Jan</button></li>
-											<li data-month="1"><button>Feb</button></li>
-											<li data-month="2"><button>Mar</button></li>
-											<li data-month="3"><button>Apr</button></li>
-											<li data-month="4"><button>May</button></li>
-											<li data-month="5"><button>Jun</button></li>
-											<li data-month="6"><button>Jul</button></li>
-											<li data-month="7"><button>Aug</button></li>
-											<li data-month="8"><button>Sep</button></li>
-											<li data-month="9"><button>Oct</button></li>
-											<li data-month="10"><button>Nov</button></li>
-											<li data-month="11"><button>Dec</button></li>
+											<li data-month="0"><button type="button">Jan</button></li>
+											<li data-month="1"><button type="button">Feb</button></li>
+											<li data-month="2"><button type="button">Mar</button></li>
+											<li data-month="3"><button type="button">Apr</button></li>
+											<li data-month="4"><button type="button">May</button></li>
+											<li data-month="5"><button type="button">Jun</button></li>
+											<li data-month="6"><button type="button">Jul</button></li>
+											<li data-month="7"><button type="button">Aug</button></li>
+											<li data-month="8"><button type="button">Sep</button></li>
+											<li data-month="9"><button type="button">Oct</button></li>
+											<li data-month="10"><button type="button">Nov</button></li>
+											<li data-month="11"><button type="button">Dec</button></li>
 										</ul>
 									</div>
 									<div class="datepicker-wheels-year">
@@ -678,8 +678,8 @@ <h2 class="header">Year</h2>
 										<ul></ul>
 									</div>
 									<div class="datepicker-wheels-footer clearfix">
-										<button class="btn datepicker-wheels-back"><span class="glyphicon glyphicon-arrow-left"></span><span class="sr-only">Return to Calendar</span></button>
-										<button type="button" class="btn datepicker-wheels-select">Select <span class="sr-only">Month and Year</span></button>
+										<button type="button" class="btn datepicker-wheels-back"><span class="glyphicon glyphicon-arrow-left"></span><span class="sr-only">Return to Calendar</span></button>
+										<button type="button" type="button" class="btn datepicker-wheels-select">Select <span class="sr-only">Month and Year</span></button>
 									</div>
 								</div>
 							</div>