diff --git a/test/mozcentral/browser.ini b/test/mozcentral/browser.ini
new file mode 100644
index 000000000..927907dc3
--- /dev/null
+++ b/test/mozcentral/browser.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+skip-if = e10s # Bug 942707 - PDF viewer doesn't work with e10s.
+support-files = file_pdfjs_test.pdf
+
+[browser_pdfjs_main.js]
+[browser_pdfjs_savedialog.js]
+[browser_pdfjs_views.js]
diff --git a/test/mozcentral/browser_pdfjs_main.js b/test/mozcentral/browser_pdfjs_main.js
index e3d7c8bab..ba0c251cb 100644
--- a/test/mozcentral/browser_pdfjs_main.js
+++ b/test/mozcentral/browser_pdfjs_main.js
@@ -31,9 +31,9 @@ function test() {
         window = newTabBrowser.contentWindow;
 
     // Runs tests after all 'load' event handlers have fired off
-    setTimeout(function() {
+    window.addEventListener("documentload", function() {
       runTests(document, window, finish);
-    }, 0);
+    }, false, true);
   }, true);
 }
 
diff --git a/test/mozcentral/browser_pdfjs_views.js b/test/mozcentral/browser_pdfjs_views.js
new file mode 100644
index 000000000..6a5da3fad
--- /dev/null
+++ b/test/mozcentral/browser_pdfjs_views.js
@@ -0,0 +1,76 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const RELATIVE_DIR = "browser/extensions/pdfjs/test/";
+const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR;
+
+function test() {
+  var tab;
+
+  let handlerService = Cc["@mozilla.org/uriloader/handler-service;1"].getService(Ci.nsIHandlerService);
+  let mimeService = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService);
+  let handlerInfo = mimeService.getFromTypeAndExtension('application/pdf', 'pdf');
+
+  // Make sure pdf.js is the default handler.
+  is(handlerInfo.alwaysAskBeforeHandling, false, 'pdf handler defaults to always-ask is false');
+  is(handlerInfo.preferredAction, Ci.nsIHandlerInfo.handleInternally, 'pdf handler defaults to internal');
+
+  info('Pref action: ' + handlerInfo.preferredAction);
+
+  waitForExplicitFinish();
+  registerCleanupFunction(function() {
+    gBrowser.removeTab(tab);
+  });
+
+  tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf");
+  var newTabBrowser = gBrowser.getBrowserForTab(tab);
+  newTabBrowser.addEventListener("load", function eventHandler() {
+    newTabBrowser.removeEventListener("load", eventHandler, true);
+
+    var document = newTabBrowser.contentDocument,
+        window = newTabBrowser.contentWindow;
+
+    // Runs tests after all 'load' event handlers have fired off
+    window.addEventListener("documentload", function() {
+      runTests(document, window, finish);
+    }, false, true);
+  }, true);
+}
+
+function runTests(document, window, callback) {
+  // check that PDF is opened with internal viewer
+  ok(document.querySelector('div#viewer'), "document content has viewer UI");
+  ok('PDFJS' in window.wrappedJSObject, "window content has PDFJS object");
+
+  //open sidebar
+  var sidebar = document.querySelector('button#sidebarToggle');
+  var outerContainer = document.querySelector('div#outerContainer');
+
+  sidebar.click();
+  ok(outerContainer.classList.contains('sidebarOpen'), 'sidebar opens on click');
+
+  // check that thumbnail view is open
+  var thumbnailView = document.querySelector('div#thumbnailView');
+  var outlineView = document.querySelector('div#outlineView');
+
+  is(thumbnailView.getAttribute('class'), null, 'Initial view is thumbnail view');
+  is(outlineView.getAttribute('class'), 'hidden', 'Outline view is hidden initially');
+
+  //switch to outline view
+  var viewOutlineButton = document.querySelector('button#viewOutline');
+  viewOutlineButton.click();
+
+  is(outlineView.getAttribute('class'), '', 'Outline view is visible when selected');
+  is(thumbnailView.getAttribute('class'), 'hidden', 'Thumbnail view is hidden when outline is selected');
+
+  //switch back to thumbnail view
+  var viewThumbnailButton = document.querySelector('button#viewThumbnail');
+  viewThumbnailButton.click();
+
+  is(thumbnailView.getAttribute('class'), '', 'Thumbnail view is visible when selected');
+  is(outlineView.getAttribute('class'), 'hidden', 'Outline view is hidden when thumbnail is selected');
+
+  sidebar.click();
+
+  callback();
+}
diff --git a/test/mozcentral/file_pdfjs_test.pdf b/test/mozcentral/file_pdfjs_test.pdf
index ea5ebe395..7ad87e3c2 100644
Binary files a/test/mozcentral/file_pdfjs_test.pdf and b/test/mozcentral/file_pdfjs_test.pdf differ
diff --git a/test/mozcentral/moz.build b/test/mozcentral/moz.build
new file mode 100644
index 000000000..33f04f853
--- /dev/null
+++ b/test/mozcentral/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+BROWSER_CHROME_MANIFESTS += ['browser.ini']
+