diff --git a/scripts/ssl-ccs-injection.nse b/scripts/ssl-ccs-injection.nse
index 7d4d6cb9d..73601dc47 100644
--- a/scripts/ssl-ccs-injection.nse
+++ b/scripts/ssl-ccs-injection.nse
@@ -72,7 +72,7 @@ categories = { "vuln", "safe" }
 
 
 portrule = function(host, port)
- return shortport.ssl(host, port) or sslcert.isPortSupported(port)
+ return shortport.ssl(host, port) or sslcert.getPrepareTLSWithoutReconnect(port)
 end
 
 local Error = {
diff --git a/scripts/ssl-cert.nse b/scripts/ssl-cert.nse
index 200f4a29d..e0e6ef34c 100644
--- a/scripts/ssl-cert.nse
+++ b/scripts/ssl-cert.nse
@@ -119,7 +119,7 @@ categories = { "default", "safe", "discovery" }
 
 
 portrule = function(host, port)
-  return shortport.ssl(host, port) or sslcert.isPortSupported(port)
+  return shortport.ssl(host, port) or sslcert.isPortSupported(port) or sslcert.getPrepareTLSWithoutReconnect(port)
 end
 
 -- Find the index of a value in an array.
diff --git a/scripts/ssl-date.nse b/scripts/ssl-date.nse
index 9806151ed..babe868f0 100644
--- a/scripts/ssl-date.nse
+++ b/scripts/ssl-date.nse
@@ -39,7 +39,7 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
 categories = {"discovery", "safe", "default"}
 
 portrule = function(host, port)
-  return shortport.ssl(host, port) or sslcert.isPortSupported(port)
+  return shortport.ssl(host, port) or sslcert.getPrepareTLSWithoutReconnect(port)
 end
 
 -- Miscellaneous script-wide constants
diff --git a/scripts/ssl-heartbleed.nse b/scripts/ssl-heartbleed.nse
index 78764ddf4..7ea5a6da0 100644
--- a/scripts/ssl-heartbleed.nse
+++ b/scripts/ssl-heartbleed.nse
@@ -45,7 +45,7 @@ categories = { "vuln", "safe" }
 local arg_protocols = stdnse.get_script_args(SCRIPT_NAME .. ".protocols") or {'TLSv1.0', 'TLSv1.1', 'TLSv1.2'}
 
 portrule = function(host, port)
-  return shortport.ssl(host, port) or sslcert.isPortSupported(port)
+  return shortport.ssl(host, port) or sslcert.getPrepareTLSWithoutReconnect(port)
 end
 
 local function recvhdr(s)