diff --git a/src/metabase/driver/sql/util.clj b/src/metabase/driver/sql/util.clj
index 7fbcb50de38cc4bd2a9194fa5c7bd2a7b37f732c..c70b584bd6b885c4e81706c95cba9bcaf3c6d462 100644
--- a/src/metabase/driver/sql/util.clj
+++ b/src/metabase/driver/sql/util.clj
@@ -155,6 +155,7 @@
 (def dialects
   "Mapping of dialect kw to dialect, used by sql formatter in [[format-sql]], to dialect."
   {:db2         Dialect/Db2
+   :databricks  Dialect/SparkSql
    :mariadb     Dialect/MariaDb
    :mysql       Dialect/MySql
    :n1ql        Dialect/N1ql
diff --git a/test/metabase/driver/sql/util_test.clj b/test/metabase/driver/sql/util_test.clj
index df18208c11e4bd8d9185e146afdf4e3577565141..4af3d1259743f6c6b612d6389d563823bcb3818d 100644
--- a/test/metabase/driver/sql/util_test.clj
+++ b/test/metabase/driver/sql/util_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.driver.sql.util-test
+(ns ^:mb/driver-tests metabase.driver.sql.util-test
   (:require
    [clojure.string :as str]
    [clojure.test :refer :all]
diff --git a/test/metabase/driver_test.clj b/test/metabase/driver_test.clj
index b9f9d0f033fad9ba462cc4c4017168d6565eaf93..13e4d4be9c846bee87f74705b4f20962d4249be6 100644
--- a/test/metabase/driver_test.clj
+++ b/test/metabase/driver_test.clj
@@ -8,6 +8,8 @@
    [metabase.driver.h2 :as h2]
    [metabase.driver.impl :as driver.impl]
    [metabase.plugins.classloader :as classloader]
+   [metabase.query-processor :as qp]
+   [metabase.query-processor.compile :as qp.compile]
    [metabase.task.sync-databases :as task.sync-databases]
    [metabase.test :as mt]
    [metabase.test.data.env :as tx.env]
@@ -193,6 +195,15 @@
             (is (= query
                    (json/parse-string weird-formatted-query)))))))))
 
+(deftest ^:parallel prettify-native-form-executable-test
+  (mt/test-drivers
+    (set (filter (partial get-method driver/prettify-native-form) (mt/normal-drivers)))
+    (is (=? {:status :completed}
+            (qp/process-query {:database (mt/id)
+                               :type     :native
+                               :native   (-> (qp.compile/compile (mt/mbql-query orders {:limit 1}))
+                                             (update :query (partial driver/prettify-native-form driver/*driver*)))})))))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Begin tests for `describe-*` methods used in sync
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;