diff --git a/Gruntfile.js b/Gruntfile.js
index a59914c1..75078270 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -168,6 +168,9 @@ module.exports = function(grunt) {
             gruntfile: {
                 src: "Gruntfile.js"
             },
+            demo: {
+                src: "demos/*.js"
+            },
             all: {
                 src: ["src/**/*.js"]
             },
diff --git a/demos/CSSLintDemo.htm b/demos/CSSLintDemo.htm
index 15a771b1..89b5bd34 100644
--- a/demos/CSSLintDemo.htm
+++ b/demos/CSSLintDemo.htm
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
     <meta charset="utf-8">
     <title>CSSLint Demo</title>
@@ -8,11 +8,12 @@
         .error { color: #D9534F; font-weight: bold; }
         .warning { color: #F0AD4E; }
     </style>
-    <script src="../release/csslint.js"></script>
+    <script src="../build/csslint.js"></script>
+    <script src="demo.js"></script>
 </head>
 <body>
     <h1>CSSLint Demo</h1>
-    <textarea rows="50" cols="100" id="input">
+    <textarea rows="30" cols="100" id="input">
 @charset "UTF-8";
 
 @import url("booya.css") print, screen;
@@ -73,35 +74,9 @@ <h1>CSSLint Demo</h1>
   }
 }
     </textarea>
-    <input type="button" id="lint-btn" value="Run CSSLint">
+    <br>
+    <button id="lint-btn">Run CSSLint</button>
     <p>(You may want to keep the CSS kinda small, this could take a while.)</p>
     <div id="output"></div>
-    <script>
-        (function() {
-            "use strict";
-
-            document.body.onclick = function(event) {
-                event = event || window.event;
-                var target = event.target || event.srcElement,
-                    results, messages, i, len;
-
-
-                if (target.id === "lint-btn") {
-                    document.getElementById("output").innerHTML = "";
-                    results = CSSLint.verify(document.getElementById("input").value);
-                    messages = results.messages;
-                    for (i=0, len=messages.length; i < len; i++) {
-                        log(messages[i].message + " (line " + messages[i].line + ", col " + messages[i].col + ")", messages[i].type);
-                    }
-
-                }
-            };
-
-            function log(value, level) {
-                    var output = document.getElementById("output");
-                    output.innerHTML += "<span class=\"" + level + "\">" + value.replace(/ /g, "&nbsp;") + "</span><br>";
-            }
-        })();
-    </script>
 </body>
 </html>
diff --git a/demos/demo.js b/demos/demo.js
new file mode 100644
index 00000000..51ac47b9
--- /dev/null
+++ b/demos/demo.js
@@ -0,0 +1,31 @@
+/* jshint browser:true */
+(function() {
+    "use strict";
+
+    window.onload = function() {
+        document.body.onclick = function(event) {
+            event = event || window.event;
+            var target = event.target || event.srcElement,
+                results,
+                messages,
+                i,
+                len;
+
+            function log(value, level) {
+                var output = document.getElementById("output");
+                output.innerHTML += "<span class=\"" + level + "\">" + value.replace(/ /g, "&nbsp;") + "</span><br>";
+            }
+
+            if (target.id === "lint-btn") {
+                document.getElementById("output").innerHTML = "";
+                results = CSSLint.verify(document.getElementById("input").value);
+                messages = results.messages;
+                for (i=0, len=messages.length; i < len; i++) {
+                    log(messages[i].message + " (line " + messages[i].line + ", col " + messages[i].col + ")", messages[i].type);
+                }
+
+            }
+
+        };
+    };
+})();
diff --git a/tests/testrunner.htm b/tests/testrunner.htm
index 37d598b8..8edc3830 100644
--- a/tests/testrunner.htm
+++ b/tests/testrunner.htm
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
     <meta charset="utf-8">
     <title>YUI Test</title>
