diff --git a/modules/drivers/presto-jdbc/resources/metabase-plugin.yaml b/modules/drivers/presto-jdbc/resources/metabase-plugin.yaml
index 973edfb617e3d041edf3188841f6b843fad644d4..17a88566eb3664a88add47d9854741b0c3604784 100644
--- a/modules/drivers/presto-jdbc/resources/metabase-plugin.yaml
+++ b/modules/drivers/presto-jdbc/resources/metabase-plugin.yaml
@@ -18,8 +18,10 @@ driver:
         - dbname
         - name: catalog
           placeholder: hive
+          display-name: Catalog
           required: false
     - name: schema
+      display-name: Schema (optional)
       required: false
     - user
     - password
diff --git a/modules/drivers/presto-jdbc/src/metabase/driver/presto_jdbc.clj b/modules/drivers/presto-jdbc/src/metabase/driver/presto_jdbc.clj
index 3a9cd285c197d49bc6c08c5bc5eb0f47b38ac94f..62a6ba10eb40e96b0e525ead4192ef9f772af61f 100644
--- a/modules/drivers/presto-jdbc/src/metabase/driver/presto_jdbc.clj
+++ b/modules/drivers/presto-jdbc/src/metabase/driver/presto_jdbc.clj
@@ -333,9 +333,9 @@
         (log/debug e (trs "Error setting statement fetch direction to FETCH_FORWARD"))))
     stmt))
 
-(defmethod driver/can-connect? :sql-jdbc
+(defmethod driver/can-connect? :presto-jdbc
   [driver details]
-  (sql-jdbc.conn/can-connect? driver details))
+  (sql-jdbc.conn/can-connect? driver (dissoc details :engine)))
 
 (defn- ^PrestoConnection pooled-conn->presto-conn
   "Unwraps the C3P0 `pooled-conn` and returns the underlying `PrestoConnection` it holds."
diff --git a/modules/drivers/presto-jdbc/test/metabase/driver/presto_jdbc_test.clj b/modules/drivers/presto-jdbc/test/metabase/driver/presto_jdbc_test.clj
index c2461078c9ac6a51d16cbd7e3a20cf3485f05819..a32aac1d2c030412767fff0020a5d636575b0464 100644
--- a/modules/drivers/presto-jdbc/test/metabase/driver/presto_jdbc_test.clj
+++ b/modules/drivers/presto-jdbc/test/metabase/driver/presto_jdbc_test.clj
@@ -4,6 +4,7 @@
             [honeysql.core :as hsql]
             [honeysql.format :as hformat]
             [java-time :as t]
+            [metabase.api.database :as database-api]
             [metabase.db.metadata-queries :as metadata-queries]
             [metabase.driver :as driver]
             [metabase.driver.presto-jdbc :as presto-jdbc]
@@ -190,3 +191,8 @@
                    (map #(select-keys % [:name :schema :db_id]) (db/select Table :db_id (mt/id)))))))
         (execute-ddl! [(format "DROP TABLE %s.%s" s t)
                        (format "DROP SCHEMA %s" s)])))))
+
+(deftest test-database-connection-test
+  (mt/test-driver :presto-jdbc
+    (testing "can-test-database-connection works"
+      (is (nil? (database-api/test-database-connection :presto-jdbc (:details (mt/db))))))))