diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 31b2b0175f..06651280bf 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -508,11 +508,6 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx,
 
   ret = SSL_CTX_use_certificate(ctx, x);
 
-  if (ERR_peek_error() != 0) {
-    // Key/certificate mismatch doesn't imply ret==0 ...
-    ret = 0;
-  }
-
   if (ret) {
     // If we could set up our certificate, now proceed to
     // the CA certificates.
diff --git a/test/simple/test-https-invalid-key.js b/test/simple/test-https-invalid-key.js
deleted file mode 100644
index 82e05a2af9..0000000000
--- a/test/simple/test-https-invalid-key.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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.
-
-if (!process.versions.openssl) {
-  console.error('Skipping because node compiled without OpenSSL.');
-  process.exit(0);
-}
-
-var common = require('../common');
-var assert = require('assert');
-var https = require('https');
-var fs = require('fs');
-var path = require('path');
-
-var options = {
-  key: fs.readFileSync(path.join(common.fixturesDir, 'keys/agent1-key.pem')),
-  cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
-};
-var serverErrorHappened = false;
-var clientErrorHappened = false;
-
-var server = https.Server(options, function(req, res) {
-  assert(false);
-});
-server.on('clientError', function(err) {
-  serverErrorHappened = true;
-  common.debug('Server: ' + err);
-  server.close();
-});
-
-server.listen(common.PORT, function() {
-  var req = https.get({port: common.PORT}, function(res) {
-    assert(false);
-  });
-  req.on('error', function(err) {
-    clientErrorHappened = true;
-    common.debug('Client: ' + err);
-  });
-});
-
-process.on('exit', function() {
-  assert(serverErrorHappened);
-  assert(clientErrorHappened);
-});
diff --git a/test/simple/test-tls-invalid-key.js b/test/simple/test-tls-invalid-key.js
deleted file mode 100644
index b4d842f2ef..0000000000
--- a/test/simple/test-tls-invalid-key.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// 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.
-
-if (!process.versions.openssl) {
-  console.error('Skipping because node compiled without OpenSSL.');
-  process.exit(0);
-}
-
-var common = require('../common');
-var assert = require('assert');
-var tls = require('tls');
-var fs = require('fs');
-var path = require('path');
-
-var options = {
-  key: fs.readFileSync(path.join(common.fixturesDir, 'keys/agent1-key.pem')),
-  cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
-};
-var serverErrorHappened = false;
-var clientErrorHappened = false;
-
-var server = tls.Server(options, function(socket) {
-  assert(false);
-});
-server.on('clientError', function(err) {
-  serverErrorHappened = true;
-  common.debug('Server: ' + err);
-  server.close();
-});
-
-server.listen(common.PORT, function() {
-  var client = tls.connect(common.PORT, function() {
-    assert(false);
-  });
-  client.on('error', function(err) {
-    clientErrorHappened = true;
-    common.debug('Client: ' + err);
-  });
-});
-
-process.on('exit', function() {
-  assert(serverErrorHappened);
-  assert(clientErrorHappened);
-});