diff --git a/lib/net.js b/lib/net.js
index 3b4f7da0786..1af61f3bd91 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -1051,6 +1051,7 @@ var createServerHandle = exports._createServerHandle =
   // assign handle in listen, and clean up if bind or listen fails
   var handle;
 
+  var isTCP = false;
   if (util.isNumber(fd) && fd >= 0) {
     try {
       handle = createHandle(fd);
@@ -1074,9 +1075,10 @@ var createServerHandle = exports._createServerHandle =
     }
   } else {
     handle = createTCP();
+    isTCP = true;
   }
 
-  if (address || port) {
+  if (address || port || isTCP) {
     debug('bind to ' + (address || 'anycast'));
     if (!address) {
       // Try binding to ipv6 first
diff --git a/test/simple/test-net-server-address.js b/test/simple/test-net-server-address.js
index a9f92c448be..671305f6621 100644
--- a/test/simple/test-net-server-address.js
+++ b/test/simple/test-net-server-address.js
@@ -56,3 +56,65 @@ server_ipv6.listen(common.PORT, localhost_ipv6, function() {
   assert.strictEqual(address_ipv6.family, family_ipv6);
   server_ipv6.close();
 });
+
+// Test without hostname or ip
+var anycast_ipv6 = '::';
+var server1 = net.createServer();
+
+server1.on('error', function(e) {
+  console.log('Error on ip socket: ' + e.toString());
+});
+
+// Specify the port number
+server1.listen(common.PORT, function() {
+  var address = server1.address();
+  assert.strictEqual(address.address, anycast_ipv6);
+  assert.strictEqual(address.port, common.PORT);
+  assert.strictEqual(address.family, family_ipv6);
+  server1.close();
+});
+
+// Test without hostname or port
+var server2 = net.createServer();
+
+server2.on('error', function (e) {
+  console.log('Error on ip socket: ' + e.toString());
+});
+
+// Don't specify the port number
+server2.listen(function () {
+  var address = server2.address();
+  assert.strictEqual(address.address, anycast_ipv6);
+  assert.strictEqual(address.family, family_ipv6);
+  server2.close();
+});
+
+// Test without hostname, but with a false-y port
+var server3 = net.createServer();
+
+server3.on('error', function (e) {
+  console.log('Error on ip socket: ' + e.toString());
+});
+
+// Specify a false-y port number
+server3.listen(0, function () {
+  var address = server3.address();
+  assert.strictEqual(address.address, anycast_ipv6);
+  assert.strictEqual(address.family, family_ipv6);
+  server3.close();
+});
+
+// Test without hostname, but with port -1
+var server4 = net.createServer();
+
+server4.on('error', function (e) {
+  console.log('Error on ip socket: ' + e.toString());
+});
+
+// Specify -1 as port number
+server4.listen(-1, function () {
+  var address = server4.address();
+  assert.strictEqual(address.address, anycast_ipv6);
+  assert.strictEqual(address.family, family_ipv6);
+  server4.close();
+});