diff --git a/test/simple/test-http-dns-error.js b/test/simple/test-http-dns-error.js
index 7abdbcf1346..fc6d6b89e11 100644
--- a/test/simple/test-http-dns-error.js
+++ b/test/simple/test-http-dns-error.js
@@ -59,10 +59,7 @@ function test(mod) {
   req.end();
 }
 
-// FIXME This doesn't work for https because the tls module won't emit errors
-// until a secure channel has been established - and that is never going to
-// happen because the host name is invalid.
-//test(https);
+test(https);
 test(http);
 
 process.on('exit', function() {
diff --git a/test/simple/test-net-dns-error.js b/test/simple/test-net-dns-error.js
new file mode 100644
index 00000000000..76b51497567
--- /dev/null
+++ b/test/simple/test-net-dns-error.js
@@ -0,0 +1,48 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var assert = require('assert');
+
+var net = require('net');
+
+var expected_bad_connections = 1;
+var actual_bad_connections = 0;
+
+var host = '********';
+host += host;
+host += host;
+host += host;
+host += host;
+host += host;
+
+function do_not_call() {
+  throw new Error('This function should not have been called.');
+}
+
+var socket = net.connect(42, host, do_not_call);
+socket.on('error', function (err) {
+  assert.equal(err.code, 'ENOTFOUND');
+  actual_bad_connections++;
+});
+
+process.on('exit', function() {
+  assert.equal(actual_bad_connections, expected_bad_connections);
+});