diff --git a/test/controls.js b/test/controls.js
index a2d7d998..44c917cd 100644
--- a/test/controls.js
+++ b/test/controls.js
@@ -5,7 +5,12 @@
 
     module('Controls', {
         setup: function () {
-            var example = $('<div id="controlsTests"></div>').appendTo("#qunit-fixture");
+            var example = $('<div id="controlsTests"></div>')
+                .css({
+                    width: 1000,
+                    height: 1000
+                })
+                .appendTo("#qunit-fixture");
 
             testLog.reset();
 
diff --git a/test/demo/fitboundswithconstraints.html b/test/demo/fitboundswithconstraints.html
index d0c1f460..51889d88 100644
--- a/test/demo/fitboundswithconstraints.html
+++ b/test/demo/fitboundswithconstraints.html
@@ -105,7 +105,7 @@
         }
 
         function goHome() {
-            _viewer.goHome();
+            _viewer.viewport.goHome();
         }
 
     </script>
diff --git a/test/overlays.js b/test/overlays.js
index c90c669f..223f99de 100644
--- a/test/overlays.js
+++ b/test/overlays.js
@@ -270,7 +270,7 @@
             waitForViewer( function() {
                 checkOverlayPosition( "after zoom and pan using image coordinates" );
 
-                viewer.goHome();
+                viewer.viewport.goHome();
                 waitForViewer( function() {
                     checkOverlayPosition( "after goHome using image coordinates" );
                     start();
@@ -333,7 +333,7 @@
             waitForViewer( function() {
                 checkOverlayPosition( "after zoom and pan using viewport coordinates" );
 
-                viewer.goHome();
+                viewer.viewport.goHome();
                 waitForViewer( function() {
                     checkOverlayPosition( "after goHome using viewport coordinates" );
                     start();
diff --git a/test/test.html b/test/test.html
index 8743f133..76abbd60 100644
--- a/test/test.html
+++ b/test/test.html
@@ -22,7 +22,6 @@
          reassignments which could be done by other test. -->
     <script src="/test/polyfills.js"></script>
     <script src="/test/basic.js"></script>
-    <script src="/test/navigator.js"></script>
     <script src="/test/strings.js"></script>
     <script src="/test/formats.js"></script>
     <script src="/test/utils.js"></script>
@@ -31,5 +30,8 @@
     <script src="/test/multi-image.js"></script>
     <script src="/test/overlays.js"></script>
     <script src="/test/controls.js"></script>
+    <!-- The navigator tests are the slowest (for now; hopefully they can be sped up)
+    so we put them last. -->
+    <script src="/test/navigator.js"></script>
 </body>
 </html>