diff --git a/test/next/jdbc/result_set_test.clj b/test/next/jdbc/result_set_test.clj
index 2925b07..bb267cb 100644
--- a/test/next/jdbc/result_set_test.clj
+++ b/test/next/jdbc/result_set_test.clj
@@ -85,8 +85,15 @@
                               ["select * from fruit where id = ?" 3]
                               {:gen-fn rs/as-lower-maps})]
       (is (map? row))
-      (is (= 3 (:id row)))
-      (is (= "Peach" (:name row))))))
+      (is (= 3 (:fruit/id row)))
+      (is (= "Peach" (:fruit/name row)))))
+  (testing "lower-case row builder"
+    (let [row (p/-execute-one (ds)
+                              ["select * from fruit where id = ?" 4]
+                              {:gen-fn rs/as-unqualified-lower-maps})]
+      (is (map? row))
+      (is (= 4 (:id row)))
+      (is (= "Orange" (:name row))))))
 
 (deftest test-mapify
   (testing "no row builder is used"
diff --git a/test/next/jdbc/sql_test.clj b/test/next/jdbc/sql_test.clj
index b5f1949..3e1ba9c 100644
--- a/test/next/jdbc/sql_test.clj
+++ b/test/next/jdbc/sql_test.clj
@@ -114,21 +114,21 @@
 
 (deftest test-insert-delete
   (testing "single insert/delete"
-    ;; H2 with :return-keys true produces an empty result set
-    (is (nil? (sql/insert! (ds) :fruit
-                           {:id 5 :name "Kiwi" :appearance "green & fuzzy"
-                            :cost 100 :grade 99.9})))
+    (is (= {:FRUIT/ID 5}
+           (sql/insert! (ds) :fruit
+                        {:name "Kiwi" :appearance "green & fuzzy"
+                         :cost 100 :grade 99.9})))
     (is (= 5 (count (sql/query (ds) ["select * from fruit"]))))
     (is (= {:next.jdbc/update-count 1}
            (sql/delete! (ds) :fruit {:id 5})))
     (is (= 4 (count (sql/query (ds) ["select * from fruit"])))))
   (testing "multiple insert/delete"
-    ;; H2 with :return-keys true produces an empty result set
-    (is (= [] (sql/insert-multi! (ds) :fruit
-                                 [:id :name :appearance :cost :grade]
-                                 [[5 "Kiwi" "green & fuzzy" 100 99.9]
-                                  [6 "Grape" "black" 10 50]
-                                  [7 "Lemon" "yellow" 20 9.9]])))
+    (is (= [{:FRUIT/ID 6} {:FRUIT/ID 7} {:FRUIT/ID 8}]
+           (sql/insert-multi! (ds) :fruit
+                              [:name :appearance :cost :grade]
+                              [["Kiwi" "green & fuzzy" 100 99.9]
+                               ["Grape" "black" 10 50]
+                               ["Lemon" "yellow" 20 9.9]])))
     (is (= 7 (count (sql/query (ds) ["select * from fruit"]))))
     (is (= {:next.jdbc/update-count 1}
            (sql/delete! (ds) :fruit {:id 6})))
diff --git a/test/next/jdbc/test_fixtures.clj b/test/next/jdbc/test_fixtures.clj
index 3531a10..891e5cb 100644
--- a/test/next/jdbc/test_fixtures.clj
+++ b/test/next/jdbc/test_fixtures.clj
@@ -27,8 +27,8 @@
       (catch Exception _))
     (jdbc/execute-one! con ["
 CREATE TABLE fruit (
-  id int default 0,
-  name varchar(32) primary key,
+  id int auto_increment primary key,
+  name varchar(32),
   appearance varchar(32),
   cost int,
   grade real