diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/010.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/010.html.ini
index 0054c6ec395..6bb64424cc1 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/010.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/010.html.ini
@@ -1,3 +1,5 @@
 [010.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: setting event handlers to undefined 3]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/011.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/011.html.ini
index 479eca88ffd..77313c47831 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/011.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/011.html.ini
@@ -1,3 +1,5 @@
 [011.html]
   type: testharness
-  expected: CRASH
+  [onmessage]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/012.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/012.html.ini
index c28b9910019..60036f44da0 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/012.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/012.html.ini
@@ -1,3 +1,5 @@
 [012.html]
   type: testharness
-  expected: CRASH
+  [onmessage]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/013.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/013.html.ini
index 4f7b88fdb13..f41a6bc9e8d 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/013.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/013.html.ini
@@ -1,3 +1,11 @@
 [013.html]
   type: testharness
-  expected: CRASH
+  [onclose]
+    expected: FAIL
+
+  [onopen]
+    expected: FAIL
+
+  [onerror]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/014.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/014.html.ini
deleted file mode 100644
index e71590ce36b..00000000000
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/014.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[014.html]
-  type: testharness
-  expected: CRASH
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/extensions/001.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/extensions/001.html.ini
index 67f5d9b0879..ca9e70bb255 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/extensions/001.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/extensions/001.html.ini
@@ -1,3 +1,5 @@
 [001.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: getting extensions in connecting]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/protocol/protocol-initial.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/protocol/protocol-initial.html.ini
index 48230119991..1c6ba352e3b 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/protocol/protocol-initial.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/protocol/protocol-initial.html.ini
@@ -1,3 +1,5 @@
 [protocol-initial.html]
   type: testharness
-  expected: CRASH
+  [WebSockets: getting protocol in connecting]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/websockets/constants.js b/tests/wpt/web-platform-tests/websockets/constants.js
index f7d46d2c44e..8312cd253fe 100644
--- a/tests/wpt/web-platform-tests/websockets/constants.js
+++ b/tests/wpt/web-platform-tests/websockets/constants.js
@@ -1,18 +1,12 @@
-//This file requires server-side substitutions and must be included as constants.js?pipe=config
-var DOMAIN_FOR_WS_TESTS = "{{host}}";
-var DOMAIN_FOR_WSS_TESTS = "{{host}}";
+//This file requires server-side substitutions and must be included as constants.js?pipe=sub
 
 var PORT = "{{ports[ws][0]}}";
 //FIXME: Add support for wss
 var PORT_SSL = "{{ports[ws][0]}}";
 
-// logic for using wss URLs instead of ws
-var SCHEME_AND_DOMAIN;
 var SCHEME_DOMAIN_PORT;
 if (location.search == '?wss') {
-  SCHEME_AND_DOMAIN = 'wss://'+DOMAIN_FOR_WSS_TESTS;
-  SCHEME_DOMAIN_PORT = SCHEME_AND_DOMAIN + ":" + PORT_SSL;
+  SCHEME_DOMAIN_PORT = 'wss://{{host}}:' + PORT_SSL;
 } else {
-  SCHEME_AND_DOMAIN = 'ws://'+DOMAIN_FOR_WS_TESTS;
-  SCHEME_DOMAIN_PORT = SCHEME_AND_DOMAIN + ":" + PORT;
+  SCHEME_DOMAIN_PORT = 'ws://{{host}}:' + PORT;
 }
diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html
index 367c36c7940..61a184a3dca 100644
--- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html
+++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/010.html
@@ -8,7 +8,7 @@
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
 for (var i = 0; i < events.length; ++i) {
   test(function(){
-    var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
+    var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
     var foo = function() {}
     ws[events[i]] = foo;
     assert_equals(ws[events[i]], foo, events[i]);
diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html
index a0043ed6456..13a506ddbc9 100644
--- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html
+++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/011.html
@@ -8,7 +8,7 @@
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
 for (var i = 0; i < events.length; ++i) {
   test(function(t) {
-    var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
+    var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
     ws[events[i]] = 1;
     assert_equals(ws[events[i]], null);
   }, events[i]);
diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html
index 8a507d37808..54500aa7de5 100644
--- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html
+++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/012.html
@@ -8,7 +8,7 @@
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
 for (var i = 0; i < events.length; ++i) {
   test(function(t) {
-    var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
+    var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
     ws[events[i]] = ";";
     assert_equals(ws[events[i]], null);
   }, events[i]);
diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html
index 719de840a53..e1d93770ad9 100644
--- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html
+++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/013.html
@@ -8,7 +8,7 @@
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
 for (var i = 0; i < events.length; ++i) {
   test(function(t) {
-    var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
+    var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
     var obj = {handleEvent:this.unreached_func("handleEvent was called")};
     ws[events[i]] = obj;
     assert_equals(ws[events[i]], obj);
diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html
index 92304a600be..81c25484cb0 100644
--- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html
+++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/events/014.html
@@ -8,7 +8,7 @@
 var events = ['onclose', 'onopen', 'onerror', 'onmessage'];
 for (var i = 0; i < events.length; ++i) {
   test(function() {
-    var ws = new WebSocket(SCHEME_AND_DOMAIN+'/');
+    var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message');
     var foo = function() {}
     ws[events[i]] = foo;
     assert_equals(ws[events[i]], foo, events[i]);
diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/extensions/001.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/extensions/001.html
index 23b9fa66432..dcdc752da82 100644
--- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/extensions/001.html
+++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/extensions/001.html
@@ -7,6 +7,6 @@
 <script>
 test(function(t) {
   // The extensions attribute must initially return the empty string
-  assert_equals((new WebSocket(SCHEME_AND_DOMAIN+'/')).extensions, '');
+  assert_equals((new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message')).extensions, '');
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html
index f89c1f05815..4450401f945 100644
--- a/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html
+++ b/tests/wpt/web-platform-tests/websockets/interfaces/WebSocket/protocol/protocol-initial.html
@@ -7,6 +7,6 @@
 <script>
 test(function(t) {
   // The protocol attribute must initially return the empty string
-  assert_equals((new WebSocket(SCHEME_AND_DOMAIN+'/')).protocol, '');
+  assert_equals((new WebSocket(SCHEME_DOMAIN_PORT + '/empty-message')).protocol, '');
 });
 </script>