diff --git a/lib/redis/connection/hiredis.rb b/lib/redis/connection/hiredis.rb
index 2e0a47222..1dbb6a3f1 100644
--- a/lib/redis/connection/hiredis.rb
+++ b/lib/redis/connection/hiredis.rb
@@ -15,8 +15,6 @@ def self.connect(config)
 
         if config[:scheme] == "unix"
           connection.connect_unix(config[:path], connect_timeout)
-        elsif config[:scheme] == "rediss" || config[:ssl]
-          raise NotImplementedError, "SSL not supported by hiredis driver"
         else
           connection.connect(config[:host], config[:port], connect_timeout)
         end
diff --git a/test/ssl_test.rb b/test/ssl_test.rb
index 7f4688163..743a83a94 100644
--- a/test/ssl_test.rb
+++ b/test/ssl_test.rb
@@ -46,17 +46,6 @@ def test_ssl_blocking
     end
   end
 
-  driver(:hiredis, :synchrony) do
-    def test_ssl_not_implemented_exception
-      assert_raises(NotImplementedError) do
-        RedisMock.start({ ping: proc { "+PONG" } }, ssl_server_opts("trusted")) do |port|
-          redis = Redis.new(port: port, ssl: true, ssl_params: { ca_file: ssl_ca_file })
-          redis.ping
-        end
-      end
-    end
-  end
-
   private
 
   def ssl_server_opts(prefix)