diff --git a/test/common.js b/test/common.js
index 8d3b31983c7..e902997adfc 100644
--- a/test/common.js
+++ b/test/common.js
@@ -20,6 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var path = require('path');
+var fs = require('fs');
 var assert = require('assert');
 
 exports.testDir = path.dirname(__filename);
@@ -35,6 +36,8 @@ if (process.platform === 'win32') {
   exports.PIPE = exports.tmpDir + '/test.sock';
   exports.opensslCli = path.join(process.execPath, '..', 'openssl-cli');
 }
+if (!fs.existsSync(exports.opensslCli))
+  exports.opensslCli = false;
 
 var util = require('util');
 for (var i in util) exports[i] = util[i];
diff --git a/test/pummel/test-https-ci-reneg-attack.js b/test/pummel/test-https-ci-reneg-attack.js
index fa2d570e5f6..4b9f32eff53 100644
--- a/test/pummel/test-https-ci-reneg-attack.js
+++ b/test/pummel/test-https-ci-reneg-attack.js
@@ -26,6 +26,11 @@ var tls = require('tls');
 var https = require('https');
 var fs = require('fs');
 
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
+  process.exit(0);
+}
+
 // renegotiation limits to test
 var LIMITS = [0, 1, 2, 3, 5, 10, 16];
 
diff --git a/test/pummel/test-tls-ci-reneg-attack.js b/test/pummel/test-tls-ci-reneg-attack.js
index 16d7e2952c3..020abcbfa0f 100644
--- a/test/pummel/test-tls-ci-reneg-attack.js
+++ b/test/pummel/test-tls-ci-reneg-attack.js
@@ -25,6 +25,11 @@ var spawn = require('child_process').spawn;
 var tls = require('tls');
 var fs = require('fs');
 
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
+  process.exit(0);
+}
+
 // renegotiation limits to test
 var LIMITS = [0, 1, 2, 3, 5, 10, 16];
 
diff --git a/test/pummel/test-tls-securepair-client.js b/test/pummel/test-tls-securepair-client.js
index 7582f98d6ca..9ef2f6e1f22 100644
--- a/test/pummel/test-tls-securepair-client.js
+++ b/test/pummel/test-tls-securepair-client.js
@@ -18,13 +18,15 @@
 // 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.');
+var common = require('../common');
+
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
   process.exit(0);
 }
 
-var common = require('../common');
 var join = require('path').join;
 var net = require('net');
 var assert = require('assert');
diff --git a/test/pummel/test-tls-session-timeout.js b/test/pummel/test-tls-session-timeout.js
index f2a9266df5b..87534f314fc 100644
--- a/test/pummel/test-tls-session-timeout.js
+++ b/test/pummel/test-tls-session-timeout.js
@@ -19,10 +19,13 @@
 // 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.');
+var common = require('../common');
+
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
   process.exit(0);
 }
+
 doTest();
 
 // This test consists of three TLS requests --
@@ -34,7 +37,6 @@ doTest();
 //   that we used has expired by now.
 
 function doTest() {
-  var common = require('../common');
   var assert = require('assert');
   var tls = require('tls');
   var fs = require('fs');
diff --git a/test/simple/test-https-foafssl.js b/test/simple/test-https-foafssl.js
index c4648557239..152d1224262 100644
--- a/test/simple/test-https-foafssl.js
+++ b/test/simple/test-https-foafssl.js
@@ -19,12 +19,13 @@
 // 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.');
+var common = require('../common');
+
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
   process.exit(0);
 }
 
-var common = require('../common');
 var assert = require('assert');
 var join = require('path').join;
 
diff --git a/test/simple/test-tls-ecdh-disable.js b/test/simple/test-tls-ecdh-disable.js
index 79e4855b971..06b4e4ffd64 100644
--- a/test/simple/test-tls-ecdh-disable.js
+++ b/test/simple/test-tls-ecdh-disable.js
@@ -20,6 +20,12 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var common = require('../common');
+
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
+  process.exit(0);
+}
+
 var assert = require('assert');
 var exec = require('child_process').exec;
 var tls = require('tls');
diff --git a/test/simple/test-tls-ecdh.js b/test/simple/test-tls-ecdh.js
index 1367e900492..446d76c8379 100644
--- a/test/simple/test-tls-ecdh.js
+++ b/test/simple/test-tls-ecdh.js
@@ -20,6 +20,12 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var common = require('../common');
+
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
+  process.exit(0);
+}
+
 var assert = require('assert');
 var exec = require('child_process').exec;
 var tls = require('tls');
diff --git a/test/simple/test-tls-securepair-server.js b/test/simple/test-tls-securepair-server.js
index 70b214a5d91..0d98ad7791d 100644
--- a/test/simple/test-tls-securepair-server.js
+++ b/test/simple/test-tls-securepair-server.js
@@ -19,13 +19,13 @@
 // 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.');
+var common = require('../common');
+
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
   process.exit(0);
 }
 
-
-var common = require('../common');
 var assert = require('assert');
 
 var join = require('path').join;
diff --git a/test/simple/test-tls-server-verify.js b/test/simple/test-tls-server-verify.js
index dac942591f0..085749af438 100644
--- a/test/simple/test-tls-server-verify.js
+++ b/test/simple/test-tls-server-verify.js
@@ -19,11 +19,10 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var common = require('../common');
 
-
-
-if (!process.versions.openssl) {
-  console.error('Skipping because node compiled without OpenSSL.');
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
   process.exit(0);
 }
 
@@ -121,7 +120,6 @@ var testCases =
     ];
 
 
-var common = require('../common');
 var constants = require('constants');
 var assert = require('assert');
 var fs = require('fs');
diff --git a/test/simple/test-tls-session-cache.js b/test/simple/test-tls-session-cache.js
index 77bdce7d971..46193657529 100644
--- a/test/simple/test-tls-session-cache.js
+++ b/test/simple/test-tls-session-cache.js
@@ -19,8 +19,10 @@
 // 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.');
+var common = require('../common');
+
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
   process.exit(0);
 }
 
@@ -31,7 +33,6 @@ doTest({ tickets: false } , function() {
 });
 
 function doTest(testOptions, callback) {
-  var common = require('../common');
   var assert = require('assert');
   var tls = require('tls');
   var fs = require('fs');
diff --git a/test/simple/test-tls-set-ciphers.js b/test/simple/test-tls-set-ciphers.js
index 22737a7ddb6..1571d5e8336 100644
--- a/test/simple/test-tls-set-ciphers.js
+++ b/test/simple/test-tls-set-ciphers.js
@@ -20,6 +20,12 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var common = require('../common');
+
+if (!common.opensslCli) {
+  console.error('Skipping because node compiled without OpenSSL CLI.');
+  process.exit(0);
+}
+
 var assert = require('assert');
 var exec = require('child_process').exec;
 var tls = require('tls');