diff --git a/‎doc/ws.md‎
Lines changed: 3 additions & 1 deletion b/‎doc/ws.md‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎lib/websocket.js‎
Lines changed: 16 additions & 2 deletions b/‎lib/websocket.js‎
Lines changed: 16 additions & 2 deletions
diff --git a/‎test/websocket.test.js‎
Lines changed: 16 additions & 0 deletions b/‎test/websocket.test.js‎
Lines changed: 16 additions & 0 deletions
@@ -307,7 +307,8 @@ This class represents a WebSocket. It extends the `EventEmitter`.
 ### new WebSocket(address[, protocols][, options])
 
 - `address` {String|url.URL} The URL to which to connect.
-- `protocols` {String|Array} The list of subprotocols.
+- `protocols` {String|Array} The list of subprotocols. If specified, this
+  overrides the `protocols` option.
 - `options` {Object}
   - `allowSynchronousEvents` {Boolean} Specifies whether any of the `'message'`,
     `'ping'`, and `'pong'` events can be emitted multiple times in the same
@@ -342,6 +343,7 @@ This class represents a WebSocket. It extends the `EventEmitter`.
   - `origin` {String} Value of the `Origin` or `Sec-WebSocket-Origin` header
     depending on the `protocolVersion`.
   - `perMessageDeflate` {Boolean|Object} Enable/disable permessage-deflate.
+  - `protocols` {String|Array} The list of subprotocols.
   - `protocolVersion` {Number} Value of the `Sec-WebSocket-Version` header.
   - `skipUTF8Validation` {Boolean} Specifies whether or not to skip UTF-8
     validation for text and close messages. Defaults to `false`. Set to `true`
 
@@ -75,11 +75,24 @@ class WebSocket extends EventEmitter {
       this._redirects = 0;
 
       if (protocols === undefined) {
-        protocols = [];
+        if (!options || options.protocols === undefined) {
+          protocols = [];
+        } else if (Array.isArray(options.protocols)) {
+          protocols = options.protocols;
+        } else {
+          protocols = [options.protocols];
+        }
       } else if (!Array.isArray(protocols)) {
         if (typeof protocols === 'object' && protocols !== null) {
           options = protocols;
-          protocols = [];
+
+          if (options.protocols === undefined) {
+            protocols = [];
+          } else if (Array.isArray(options.protocols)) {
+            protocols = options.protocols;
+          } else {
+            protocols = [options.protocols];
+          }
         } else {
           protocols = [protocols];
         }
@@ -681,6 +694,7 @@ function initAsClient(websocket, address, protocols, options) {
     socketPath: undefined,
     hostname: undefined,
     protocol: undefined,
+    protocols: undefined,
     timeout: undefined,
     method: 'GET',
     host: undefined,
 
@@ -4389,6 +4389,22 @@ describe('WebSocket', () => {
         ws.close();
       });
     });
+
+    it('honors the `protocols` option', () => {
+      const url = 'ws://localhost';
+      function lookup() {}
+
+      for (const args of [
+        [url, { lookup, protocols: ['foo'] }],
+        [url, { lookup, protocols: 'foo' }],
+        [url, undefined, { lookup, protocols: ['foo'] }],
+        [url, undefined, { lookup, protocols: 'foo' }],
+        [url, 'foo', { lookup, protocols: ['bar'] }]
+      ]) {
+        const ws = new WebSocket(...args);
+        assert.strictEqual(ws._req.getHeader('sec-websocket-protocol'), 'foo');
+      }
+    });
   });
 
   describe('permessage-deflate', () => {