diff --git a/packages/livedata/livedata_connection.js b/packages/livedata/livedata_connection.js
index 13d416674e..ad2aae5e04 100644
--- a/packages/livedata/livedata_connection.js
+++ b/packages/livedata/livedata_connection.js
@@ -1152,13 +1152,12 @@ _.extend(Meteor._LivedataConnection.prototype, {
 });
 
 _.extend(Meteor, {
-  // @param url {String} URL to Meteor app, or to sockjs endpoint (deprecated),
+  // @param url {String} URL to Meteor app,
   //     e.g.:
   //     "subdomain.meteor.com",
   //     "http://subdomain.meteor.com",
   //     "/",
-  //     "http://subdomain.meteor.com/sockjs" (deprecated),
-  //     "/sockjs" (deprecated)
+  //     "ddp+sockjs://ddp--****-foo.meteor.com/sockjs"
   connect: function (url, _reloadOnUpdate) {
     var ret = new Meteor._LivedataConnection(
       url, {reloadOnUpdate: _reloadOnUpdate});
diff --git a/packages/stream/stream_client.js b/packages/stream/stream_client.js
index e8c2880d26..d479ab6a79 100644
--- a/packages/stream/stream_client.js
+++ b/packages/stream/stream_client.js
@@ -1,5 +1,6 @@
-// @param url {String} URL to Meteor app or sockjs endpoint (deprecated)
-//   "http://subdomain.meteor.com/sockjs" or "/sockjs"
+// @param url {String} URL to Meteor app
+//   "http://subdomain.meteor.com/" or "/" or
+//   "ddp+sockjs://foo-**.meteor.com/sockjs"
 Meteor._Stream = function (url) {
   var self = this;
 
diff --git a/packages/stream/stream_tests.js b/packages/stream/stream_tests.js
index 5a1d439557..496fb1fa73 100644
--- a/packages/stream/stream_tests.js
+++ b/packages/stream/stream_tests.js
@@ -35,36 +35,36 @@ testAsyncMulti("stream - reconnect", [
 
 Tinytest.add("stream - sockjs urls are computed correctly", function(test) {
   var testHasSockjsUrl = function(raw, expectedSockjsUrl) {
-    test.equal(Meteor._Stream._toSockjsUrl(raw), expectedSockjsUrl);
+    var actual = Meteor._Stream._toSockjsUrl(raw);
+    if (expectedSockjsUrl instanceof RegExp)
+      test.isTrue(actual.match(expectedSockjsUrl));
+    else
+      test.equal(actual, expectedSockjsUrl);
   };
 
-  testHasSockjsUrl("http://subdomain.meteor.com/sockjs",
-                   "http://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("http://subdomain.meteor.com/",
                    "http://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("http://subdomain.meteor.com",
                    "http://subdomain.meteor.com/sockjs");
-  testHasSockjsUrl("subdomain.meteor.com/sockjs",
-                   "http://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("subdomain.meteor.com/",
                    "http://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("subdomain.meteor.com",
                    "http://subdomain.meteor.com/sockjs");
-  testHasSockjsUrl("/sockjs", "/sockjs");
   testHasSockjsUrl("/", "/sockjs");
 
-  testHasSockjsUrl("http://localhost:3000/sockjs",
-                   "http://localhost:3000/sockjs");
   testHasSockjsUrl("http://localhost:3000/", "http://localhost:3000/sockjs");
   testHasSockjsUrl("http://localhost:3000", "http://localhost:3000/sockjs");
   testHasSockjsUrl("localhost:3000", "http://localhost:3000/sockjs");
 
-  testHasSockjsUrl("https://subdomain.meteor.com/sockjs",
-                   "https://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("https://subdomain.meteor.com/",
                    "https://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("https://subdomain.meteor.com",
                    "https://subdomain.meteor.com/sockjs");
+
+  testHasSockjsUrl("ddp+sockjs://ddp--****-foo.meteor.com/sockjs",
+                   /^https:\/\/ddp--\d\d\d\d-foo\.meteor\.com\/sockjs$/);
+  testHasSockjsUrl("ddpi+sockjs://ddp--****-foo.meteor.com/sockjs",
+                   /^http:\/\/ddp--\d\d\d\d-foo\.meteor\.com\/sockjs$/);
 });
 
 testAsyncMulti("stream - /websocket is a websocket endpoint", [