diff --git a/presentation-api/controlling-ua/reconnectToPresentation_sandboxing_error.html b/presentation-api/controlling-ua/PresentationRequest_sandboxing_error.html
similarity index 51%
rename from presentation-api/controlling-ua/reconnectToPresentation_sandboxing_error.html
rename to presentation-api/controlling-ua/PresentationRequest_sandboxing_error.html
index c3286f55a6088d..ad5e32a45a3a67 100644
--- a/presentation-api/controlling-ua/reconnectToPresentation_sandboxing_error.html
+++ b/presentation-api/controlling-ua/PresentationRequest_sandboxing_error.html
@@ -1,24 +1,24 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Sandboxing: Reconnecting a presentation from a nested context fails when allow-presentation is not set</title>
+<title>Sandboxing: Creating a PresentationRequest from a nested context fails when allow-presentation is not set</title>
 <link rel="author" title="Francois Daoust" href="https://www.w3.org/People/#fd">
-<link rel="help" href="http://w3c.github.io/presentation-api/#dom-presentationrequest-reconnect">
+<link rel="help" href="http://w3c.github.io/presentation-api/#constructing-a-presentationrequest">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
     async_test(function (t) {
-        function startWhenReady(ev) {
+        var startWhenReady = t.step_func(function (ev) {
             var childFrame = document.getElementById('childFrame');
             if (ev.data === 'ready') {
                 window.removeEventListener('message', startWhenReady);
-                childFrame.contentWindow.postMessage('reconnect', '*');
-                window.addEventListener('message', t.step_func(function (ev) {
-                    assert_equals(ev.data, 'SecurityError',
-                        'Presentation sandboxing did not work as expected.');
-                    t.done();
-                }));
+                window.addEventListener('message', checkFinalMessage);
+                childFrame.contentWindow.postMessage('create', '*');
             }
-        }
+        });
+
+        var checkFinalMessage = t.step_func_done(function (ev) {
+            assert_equals(ev.data, 'SecurityError', 'Presentation sandboxing did not work as expected.');
+        });
 
         window.addEventListener('message', startWhenReady);
     });
diff --git a/presentation-api/controlling-ua/PresentationRequest_sandboxing_success.html b/presentation-api/controlling-ua/PresentationRequest_sandboxing_success.html
new file mode 100644
index 00000000000000..7ede80d5952dd7
--- /dev/null
+++ b/presentation-api/controlling-ua/PresentationRequest_sandboxing_success.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Sandboxing: Creating a PresentationRequest from a nested context succeeds when allow-presentation is set</title>
+<link rel="author" title="Francois Daoust" href="https://www.w3.org/People/#fd">
+<link rel="help" href="http://w3c.github.io/presentation-api/#constructing-a-presentationrequest">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+    async_test(function (t) {
+        var startWhenReady = t.step_func(function (ev) {
+            var childFrame = document.getElementById('childFrame');
+            if (ev.data === 'ready') {
+                window.removeEventListener('message', startWhenReady);
+                window.addEventListener('message', checkFinalMessage);
+                childFrame.contentWindow.postMessage('create', '*');
+            }
+        });
+
+        var checkFinalMessage = t.step_func_done(function (ev) {
+            assert_equals(ev.data, 'success', 'Presentation sandboxing did not work as expected.');
+        });
+
+        window.addEventListener('message', startWhenReady);
+    });
+</script>
+<iframe id="childFrame" sandbox="allow-scripts allow-presentation" style="display:none" src="support/iframe.html"></iframe>
diff --git a/presentation-api/controlling-ua/getAvailability_sandboxing_error.html b/presentation-api/controlling-ua/getAvailability_sandboxing_error.html
deleted file mode 100644
index 88cae73c0eae71..00000000000000
--- a/presentation-api/controlling-ua/getAvailability_sandboxing_error.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Sandboxing: Retrieving display availability from a nested context fails when allow-presentation is not set</title>
-<link rel="author" title="Francois Daoust" href="https://www.w3.org/People/#fd">
-<link rel="help" href="http://w3c.github.io/presentation-api/#dom-presentationrequest-getavailability">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-    async_test(function (t) {
-        function startWhenReady(ev) {
-            var childFrame = document.getElementById('childFrame');
-            if (ev.data === 'ready') {
-                window.removeEventListener('message', startWhenReady);
-                childFrame.contentWindow.postMessage('getAvailability', '*');
-                window.addEventListener('message', t.step_func(function (ev) {
-                    assert_equals(ev.data, 'SecurityError',
-                        'Presentation sandboxing did not work as expected.');
-                    t.done();
-                }));
-            }
-        }
-
-        window.addEventListener('message', startWhenReady);
-    });
-</script>
-<iframe id="childFrame" sandbox="allow-scripts" style="display:none" src="support/iframe.html"></iframe>
diff --git a/presentation-api/controlling-ua/startNewPresentation_sandboxing_error-manual.html b/presentation-api/controlling-ua/startNewPresentation_sandboxing_error-manual.html
deleted file mode 100644
index 06334b000bd50c..00000000000000
--- a/presentation-api/controlling-ua/startNewPresentation_sandboxing_error-manual.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Sandboxing: starting a presentation from a nested context fails when allow-presentation is not set</title>
-<link rel="author" title="Francois Daoust" href="https://www.w3.org/People/#fd">
-<link rel="help" href="http://w3c.github.io/presentation-api/#dom-presentationrequest-start">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<iframe id="childFrame" sandbox="allow-scripts" style="display:none" src="support/iframe.html"></iframe>
-<p>Click the button below to start the manual test. If prompted to select a device, please dismiss the dialog box. The test passes if a "PASS" result appears.</p>
-<button id="presentBtn" onclick="startPresentationTest()">Start Presentation Test</button>
-
-<script>
-    setup({explicit_timeout: true});
-
-    var presentBtn = document.getElementById('presentBtn');
-    var childFrame = document.getElementById('childFrame');
-
-    function startPresentationTest() {
-        presentBtn.disabled = true;
-        async_test(function (t) {
-            childFrame.contentWindow.postMessage('start', '*');
-            window.addEventListener('message', t.step_func(function (ev) {
-                assert_equals(ev.data, 'SecurityError',
-                    'Presentation sandboxing did not work as expected.');
-                t.done();
-            }));
-        });
-    }
-</script>
-
diff --git a/presentation-api/controlling-ua/support/iframe.html b/presentation-api/controlling-ua/support/iframe.html
index b061a35271ac26..a37f0fcd8e0aa8 100644
--- a/presentation-api/controlling-ua/support/iframe.html
+++ b/presentation-api/controlling-ua/support/iframe.html
@@ -17,8 +17,18 @@
             return '../' + url;
           }
         });
-        var request = new PresentationRequest(urls);
-        if (ev.data === 'start') {
+        var request = null;
+        if (ev.data === 'create') {
+          try {
+            request = new PresentationRequest(urls);
+            parent.window.postMessage('success', '*');
+          }
+          catch (err) {
+            parent.window.postMessage(err.name, '*');
+          }
+        }
+        else if (ev.data === 'start') {
+          request = new PresentationRequest(urls);
           request.start()
             .then(function () {
               parent.window.postMessage('success', '*');
@@ -38,6 +48,7 @@
             });
         }
         else if (ev.data === 'reconnect') {
+          request = new PresentationRequest(urls);
           request.reconnect('someid')
             .then(function () {
               parent.window.postMessage('success', '*');
@@ -47,6 +58,7 @@
             });
         }
         else if (ev.data === 'getAvailability') {
+          request = new PresentationRequest(urls);
           request.getAvailability()
             .then(function () {
               parent.window.postMessage('success', '*');
