diff --git a/src/next/jdbc/datafy.clj b/src/next/jdbc/datafy.clj
index d151258..2bee2e2 100644
--- a/src/next/jdbc/datafy.clj
+++ b/src/next/jdbc/datafy.clj
@@ -1,4 +1,4 @@
-;; copyright (c) 2018-2020 Sean Corfield, all rights reserved
+;; copyright (c) 2020 Sean Corfield, all rights reserved
 
 (ns next.jdbc.datafy
   "This namespace provides datafication of several JDBC object types:
diff --git a/src/next/jdbc/result_set.clj b/src/next/jdbc/result_set.clj
index d97edef..13b7b36 100644
--- a/src/next/jdbc/result_set.clj
+++ b/src/next/jdbc/result_set.clj
@@ -18,6 +18,7 @@
   for implementations of `ReadableColumn` that provide automatic
   conversion of some SQL data types to Java Time objects."
   (:require [clojure.core.protocols :as core-p]
+            [clojure.datafy :as d]
             [next.jdbc.prepare :as prepare]
             [next.jdbc.protocols :as p])
   (:import (java.sql Clob
@@ -427,7 +428,7 @@
       InspectableMapifiedResultSet
       (row-number   [this] (.getRow rs))
       (column-names [this] (:cols @builder))
-      (metadata     [this] (core-p/datafy (:rsmeta @builder)))
+      (metadata     [this] (d/datafy (:rsmeta @builder)))
 
       clojure.lang.IPersistentMap
       (assoc [this k v]
@@ -509,7 +510,7 @@
         ;; that they can be thrown when the actual functions are called
         (let [row  (try (.getRow rs)     (catch Throwable t t))
               cols (try (:cols @builder) (catch Throwable t t))
-              meta (try (core-p/datafy (:rsmeta @builder)) (catch Throwable t t))]
+              meta (try (d/datafy (:rsmeta @builder)) (catch Throwable t t))]
           (with-meta
             (row-builder @builder)
             {`core-p/datafy
diff --git a/test/next/jdbc/datafy_test.clj b/test/next/jdbc/datafy_test.clj
index 5709bca..fe1a41c 100644
--- a/test/next/jdbc/datafy_test.clj
+++ b/test/next/jdbc/datafy_test.clj
@@ -1,18 +1,16 @@
-;; copyright (c) 2019-2020 Sean Corfield, all rights reserved
+;; copyright (c) 2020 Sean Corfield, all rights reserved
 
 (ns next.jdbc.datafy-test
   "Tests for the datafy extensions over JDBC types."
-  (:require [clojure.core.protocols :as core-p]
+  (:require [clojure.datafy :as d]
             [clojure.set :as set]
-            [clojure.string :as str]
             [clojure.test :refer [deftest is testing use-fixtures]]
             [next.jdbc :as jdbc]
             [next.jdbc.datafy]
+            [next.jdbc.specs :as specs]
             [next.jdbc.test-fixtures :refer [with-test-db db ds
-                                              derby?
-                                              mssql?]]
-            [next.jdbc.specs :as specs])
-  (:import (java.sql ResultSet)))
+                                              derby?]])
+  (:import (java.sql DatabaseMetaData)))
 
 (set! *warn-on-reflection* true)
 
@@ -33,15 +31,19 @@
   (testing "basic datafication"
     (if (derby?)
       (is (= #{:exception :cause} ; at least one property not supported
-             (set (keys (core-p/datafy (jdbc/get-connection (ds)))))))
-      (let [data (set (keys (core-p/datafy (jdbc/get-connection (ds)))))]
+             (set (keys (d/datafy (jdbc/get-connection (ds)))))))
+      (let [data (set (keys (d/datafy (jdbc/get-connection (ds)))))]
         (when-let [diff (seq (set/difference data basic-connection-keys))]
           (println (:dbtype (db)) (sort diff)))
         (is (= basic-connection-keys
                (set/intersection basic-connection-keys data))))))
   (testing "nav to metadata yields object"
     (when-not (derby?)
-      (is (instance? java.sql.DatabaseMetaData
-                     (core-p/nav (core-p/datafy (jdbc/get-connection (ds)))
-                                 :metaData
-                                 nil))))))
+      (is (instance? DatabaseMetaData
+                     (d/nav (d/datafy (jdbc/get-connection (ds)))
+                            :metaData
+                            nil))))))
+
+(deftest database-metadata-datafy-tests)
+
+(deftest result-set-metadata-datafy-tests)