diff --git a/debian/novnc.install b/debian/novnc.install
index 9f6a3260..92867bce 100644
--- a/debian/novnc.install
+++ b/debian/novnc.install
@@ -23,9 +23,7 @@ include/playback.js   /usr/share/novnc/include
 include/rfb.js   /usr/share/novnc/include
 include/ui.js   /usr/share/novnc/include
 include/util.js   /usr/share/novnc/include
-include/vnc.js   /usr/share/novnc/include
 include/websock.js   /usr/share/novnc/include
 include/webutil.js   /usr/share/novnc/include
 include/jsunzip.js   /usr/share/novnc/include
-include/start.js     /usr/share/novnc/include
 include/web-socket-js/*   /usr/share/novnc/include/web-socket-js
diff --git a/include/rfb.js b/include/rfb.js
index 2110b7af..5b46c12b 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -1841,15 +1841,16 @@ that.clipboardPasteFrom = function(text) {
 };
 
 // Override internal functions for testing
-that.testMode = function(override_send) {
+that.testMode = function(override_send, data_mode) {
     test_mode = true;
-    that.recv_message = ws.testMode(override_send);
+    that.recv_message = ws.testMode(override_send, data_mode);
 
     checkEvents = function () { /* Stub Out */ };
     that.connect = function(host, port, password) {
             rfb_host = host;
             rfb_port = port;
             rfb_password = password;
+            init_vars();
             updateState('ProtocolVersion', "Starting VNC handshake");
         };
 };
diff --git a/include/start.js b/include/start.js
deleted file mode 100644
index b5d90b4c..00000000
--- a/include/start.js
+++ /dev/null
@@ -1 +0,0 @@
-window.onload = UI.load;
diff --git a/include/ui.js b/include/ui.js
index 44e91628..f6eda04c 100644
--- a/include/ui.js
+++ b/include/ui.js
@@ -10,6 +10,11 @@
 /*jslint white: false, browser: true */
 /*global window, $D, Util, WebUtil, RFB, Display */
 
+// Load supporting scripts
+window.onscriptsload = function () { UI.load(); };
+Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
+                   "input.js", "display.js", "jsunzip.js", "rfb.js"]);
+
 var UI = {
 
 rfb_state : 'loaded',
diff --git a/include/util.js b/include/util.js
index fc9242e1..7d1e4c02 100644
--- a/include/util.js
+++ b/include/util.js
@@ -207,6 +207,45 @@ Util.conf_defaults = function(cfg, api, defaults, arr) {
  * Cross-browser routines
  */
 
+
+// Dynamically load scripts without using document.write()
+// Reference: http://unixpapa.com/js/dyna.html
+//
+// Handles the case where load_scripts is invoked from a script that
+// itself is loaded via load_scripts. Once all scripts are loaded the
+// window.onscriptsloaded handler is called (if set).
+Util.get_include_uri = function() {
+    return (typeof INCLUDE_URI !== "undefined") ? INCLUDE_URI : "include/";
+}
+Util._pending_scripts = [];
+Util.load_scripts = function(files) {
+    var head = document.getElementsByTagName('head')[0],
+        ps = Util._pending_scripts;
+    for (var f=0; f<files.length; f++) {
+        var script = document.createElement('script');
+        script.type = 'text/javascript';
+        script.src = Util.get_include_uri() + files[f];
+        //console.log("loading script: " + Util.get_include_uri() +  files[f]);
+        head.appendChild(script);
+        ps.push(script);
+        script.onload = script.onreadystatechange = function (e) {
+            if (!this.readyState || 
+                this.readyState == 'complete' ||
+                this.readyState == 'loaded') {
+                this.onload = this.onreadystatechange = null;
+                if (ps.indexOf(this) >= 0) {
+                    //console.log("loaded script: " + this.src);
+                    ps.splice(ps.indexOf(this), 1);
+                }
+                // Call window.onscriptsload after last script loads
+                if (ps.length === 0 && window.onscriptsload) {
+                    window.onscriptsload();
+                }
+            }
+        }
+    }
+}
+
 // Get DOM element position on page
 Util.getPosition = function (obj) {
     var x = 0, y = 0;
diff --git a/include/vnc.js b/include/vnc.js
deleted file mode 100644
index bb4c3ad0..00000000
--- a/include/vnc.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * See README.md for usage and integration instructions.
- */
-
-/*jslint evil: true */
-/*global window, document, INCLUDE_URI */
-
-/*
- * Load supporting scripts
- */
-function get_INCLUDE_URI() {
-    return (typeof INCLUDE_URI !== "undefined") ? INCLUDE_URI : "include/";
-}
-/*
- * Dynamically load a script without using document.write()
- * Reference: http://unixpapa.com/js/dyna.html
- */
-function load_scripts(base, files) {
-    var head = document.getElementsByTagName('head')[0];
-    for (var i=0; i<files.length; i++) {
-        var script = document.createElement('script');
-        script.type = 'text/javascript';
-        script.src = base + files[i];
-        head.appendChild(script);
-    }
-}
-
-load_scripts(get_INCLUDE_URI(),
-    ["util.js", "webutil.js", "base64.js", "websock.js", "des.js",
-     "input.js", "display.js", "rfb.js", "jsunzip.js"]);
-
diff --git a/include/websock.js b/include/websock.js
index 87d6e8cf..782a1194 100644
--- a/include/websock.js
+++ b/include/websock.js
@@ -35,23 +35,14 @@ if (window.WebSocket && !window.WEB_SOCKET_FORCE_FLASH) {
 
     Websock_native = false;
     (function () {
-        function get_INCLUDE_URI() {
-            return (typeof INCLUDE_URI !== "undefined") ?
-                INCLUDE_URI : "include/";
-        }
-
-        var start = "<script src='" + get_INCLUDE_URI(),
-            end = "'><\/script>", extra = "";
-
-        window.WEB_SOCKET_SWF_LOCATION = get_INCLUDE_URI() +
+        window.WEB_SOCKET_SWF_LOCATION = Util.get_include_uri() +
                     "web-socket-js/WebSocketMain.swf";
         if (Util.Engine.trident) {
             Util.Debug("Forcing uncached load of WebSocketMain.swf");
             window.WEB_SOCKET_SWF_LOCATION += "?" + Math.random();
         }
-        extra += start + "web-socket-js/swfobject.js" + end;
-        extra += start + "web-socket-js/web_socket.js" + end;
-        document.write(extra);
+        Util.load_scripts(["web-socket-js/swfobject.js",
+                           "web-socket-js/web_socket.js"]);
     }());
 }
 
diff --git a/tests/vnc_perf.html b/tests/vnc_perf.html
index eda6fd09..d75394ec 100644
--- a/tests/vnc_perf.html
+++ b/tests/vnc_perf.html
@@ -39,11 +39,15 @@
     <script type="text/javascript">
         var INCLUDE_URI= "../include/";
     </script>
-    <script src="../include/vnc.js"></script>
+    <script src="../include/util.js"></script>
     <script src="../include/playback.js"></script>
     <script src="../data/multi.js"></script>
 
     <script>
+        // Load supporting scripts
+        Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
+                           "input.js", "display.js", "jsunzip.js", "rfb.js"]);
+
         var start_time, VNC_frame_data, pass, passes, encIdx,
             encOrder = ['raw', 'rre', 'hextile', 'tightpng', 'copyrect'],
             encTot = {}, encMin = {}, encMax = {},
@@ -188,7 +192,7 @@
                 " (min/avg/max)");
         }
 
-        window.onload = function() {
+        window.onscriptsload = function() {
             var i, enc;
             dbgmsg("Frame lengths:");
             for (i = 0; i < encOrder.length; i++) {
diff --git a/tests/vnc_playback.html b/tests/vnc_playback.html
index a258a476..5ef0e449 100644
--- a/tests/vnc_playback.html
+++ b/tests/vnc_playback.html
@@ -41,8 +41,8 @@
     <script type="text/javascript">
         var INCLUDE_URI= "../include/";
     </script>
-    <script src="../include/vnc.js"></script>
-    <script src="../include/playback.js"></script>
+    <script src="../include/util.js"></script>
+    <script src="../include/webutil.js"></script>
 
     <script>
         var fname, start_time;
@@ -55,10 +55,13 @@
         }
 
         fname = WebUtil.getQueryVar('data', null);
-
         if (fname) {
             message("Loading " + fname);
-            document.write('<script src="' + fname + '"><\/script>');
+            // Load supporting scripts
+            Util.load_scripts(["base64.js", "websock.js", "des.js",
+                            "input.js", "display.js", "jsunzip.js", "rfb.js",
+                            "playback.js", fname]);
+
         } else {
             message("Must specify data=FOO in query string.");
         }
@@ -115,7 +118,7 @@
 
         }
 
-        window.onload = function() {
+        window.onscriptsload = function () {
             iterations = WebUtil.getQueryVar('iterations', 3);
             $D('iterations').value = iterations;
             mode = WebUtil.getQueryVar('mode', 3);
diff --git a/vnc.html b/vnc.html
index 9c3ced25..841e8744 100644
--- a/vnc.html
+++ b/vnc.html
@@ -39,10 +39,6 @@
         src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
     -->
 
-    <script src="include/vnc.js"></script>
-    <script src="include/ui.js"></script>
-    <script src="include/start.js"></script>
-
 </head>
 
 <body>
@@ -178,5 +174,8 @@
         </div>
 
     </div>
+    <script src="include/util.js"></script>
+    <script src="include/ui.js"></script>
+
  </body>
 </html>
diff --git a/vnc_auto.html b/vnc_auto.html
index 2434d97e..a6273256 100644
--- a/vnc_auto.html
+++ b/vnc_auto.html
@@ -17,7 +17,7 @@
         <script type='text/javascript' 
             src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
         -->
-        <script src="include/vnc.js"></script>
+        <script src="include/util.js"></script>
     </head>
 
     <body style="margin: 0px;">
@@ -41,6 +41,10 @@
         /*global window, $, Util, RFB, */
         "use strict";
 
+        // Load supporting scripts
+        Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
+                           "input.js", "display.js", "jsunzip.js", "rfb.js"]);
+
         var rfb;
 
         function passwordRequired(rfb) {
@@ -84,7 +88,7 @@
             }
         }
 
-        window.onload = function () {
+        window.onscriptsload = function () {
             var host, port, password, path, token;
 
             $D('sendCtrlAltDelButton').style.display = "inline";