diff --git a/lib/puma/minissl/context_builder.rb b/lib/puma/minissl/context_builder.rb
index dade2e1842..866108ed9b 100644
--- a/lib/puma/minissl/context_builder.rb
+++ b/lib/puma/minissl/context_builder.rb
@@ -38,7 +38,7 @@ def context
           ctx.keystore_pass = params['keystore-pass']
           ctx.ssl_cipher_list = params['ssl_cipher_list'] if params['ssl_cipher_list']
         else
-          unless params['key']
+          if params['key'].nil? || params['key'] == ""
             if localhost_authority
               params['key'] = localhost_authority_context[0]
             else
@@ -48,7 +48,7 @@ def context
 
           ctx.key = params['key']
 
-          unless params['cert']
+          if params['cert'].nil? || params['cert'] == ""
             if localhost_authority
               params['cert'] = localhost_authority_context[1]
             else
diff --git a/test/test_integration_ssl.rb b/test/test_integration_ssl.rb
index 8f746e5ab7..436dd05a8d 100644
--- a/test/test_integration_ssl.rb
+++ b/test/test_integration_ssl.rb
@@ -1,6 +1,7 @@
 require_relative 'helper'
 require_relative "helpers/integration"
 
+
 # These tests are used to verify that Puma works with SSL sockets.  Only
 # integration tests isolate the server from the test environment, so there
 # should be a few SSL tests.
@@ -15,18 +16,10 @@ class TestIntegrationSSL < TestIntegration
   require "net/http"
   require "openssl"
 
-  def teardown
-    @server.close unless @server.closed?
-    @server = nil
-    super
-  end
-
-  def generate_config(opts = nil)
+  def setup
     @bind_port = UniquePort.call
     @control_tcp_port = UniquePort.call
-
-    config = <<RUBY
-#{opts}
+    @default_config = <<RUBY
 if ::Puma.jruby?
   keystore =  '#{File.expand_path '../examples/puma/keystore.jks', __dir__}'
   keystore_pass = 'jruby_puma'
@@ -54,14 +47,35 @@ def generate_config(opts = nil)
 end
 RUBY
 
+    @localhost_config = <<RUBY
+require 'localhost/authority'
+
+ssl_bind '#{HOST}', '#{@bind_port}'
+
+activate_control_app 'tcp://#{HOST}:#{@control_tcp_port}', { auth_token: '#{TOKEN}' }
+
+app do |env|
+  [200, {}, [env['rack.url_scheme']]]
+end
+RUBY
+
+    super
+  end
+
+  def teardown
+    @server.close unless @server.closed?
+    @server = nil
+    super
+  end
+
+  def generate_config(config)
     config_file = Tempfile.new %w(config .rb)
-    config_file.write config
+    config_file.write(config)
     config_file.close
     config_file.path
   end
 
-  def start_server(opts = nil)
-    cmd = "#{BASE} bin/puma -C #{generate_config opts}"
+  def start_server(cmd)
     @server = IO.popen cmd, 'r'
     wait_for_server_to_boot
     @pid = @server.pid
@@ -81,7 +95,7 @@ def stop_server
 
   def test_ssl_run
     body = nil
-    start_server
+    start_server("#{BASE} bin/puma -C #{generate_config(@default_config)}")
     @http.start do
       req = Net::HTTP::Get.new '/', {}
       @http.request(req) { |resp| body = resp.body }
@@ -89,4 +103,15 @@ def test_ssl_run
     assert_equal 'https', body
     stop_server
   end
+
+  def test_ssl_run_with_localhost_authority
+    body = nil
+    start_server("#{BASE} bin/puma -C #{generate_config(@localhost_config)}")
+    @http.start do
+      req = Net::HTTP::Get.new '/', {}
+      @http.request(req) { |resp| body = resp.body }
+    end
+    assert_equal 'https', body
+    stop_server
+  end unless ::Puma::IS_JRUBY
 end if ::Puma::HAS_SSL