diff --git a/src/datomish/util.cljc b/src/datomish/util.cljc
index 6829d68f..0d5d7029 100644
--- a/src/datomish/util.cljc
+++ b/src/datomish/util.cljc
@@ -9,7 +9,7 @@
 (defn var->sql-var
   "Turns '?xyz into :xyz."
   [x]
-  (when-not (and (symbol? x)
-                 (str/starts-with? (name x) "?"))
-    (raise (str x " is not a Datalog var.")))
-  (keyword (subs (name x) 1)))
+  (if (and (symbol? x)
+           (str/starts-with? (name x) "?"))
+    (keyword (subs (name x) 1))
+    (raise (str x " is not a Datalog var."))))
diff --git a/test/datomish/test/query.cljc b/test/datomish/test/query.cljc
new file mode 100644
index 00000000..6f18e6e4
--- /dev/null
+++ b/test/datomish/test/query.cljc
@@ -0,0 +1,9 @@
+(ns datomish.test.query
+  (:require
+     [datomish.query :as dq]
+     #?(:clj  [clojure.test :as t :refer [is are deftest testing]])
+     #?(:cljs [cljs.test :as t :refer-macros [is are deftest testing]])
+     ))
+
+(deftest test-query
+  (is (= 1 1)))
diff --git a/test/datomish/test/query.cljs b/test/datomish/test/query.cljs
deleted file mode 100644
index edc7e4ef..00000000
--- a/test/datomish/test/query.cljs
+++ /dev/null
@@ -1,7 +0,0 @@
-(ns datomish.test.query
-  (:require
-   [cljs.test    :as t :refer-macros [is are deftest testing]]
-   [datomish.query :as dq]))
-
-(deftest test-query
-  (is (= 1 1)))
diff --git a/test/datomish/test/transforms.cljs b/test/datomish/test/transforms.cljc
similarity index 67%
rename from test/datomish/test/transforms.cljs
rename to test/datomish/test/transforms.cljc
index 578ca644..2abdd0e2 100644
--- a/test/datomish/test/transforms.cljs
+++ b/test/datomish/test/transforms.cljc
@@ -1,7 +1,9 @@
 (ns datomish.test.transforms
   (:require
-   [cljs.test    :as t :refer-macros [is are deftest testing]]
-   [datomish.transforms :as transforms]))
+     [datomish.transforms :as transforms]
+     #?(:clj  [clojure.test :as t :refer [is are deftest testing]])
+     #?(:cljs [cljs.test :as t :refer-macros [is are deftest testing]])
+     ))
 
 (deftest test-attribute-transform-string
   (is (= "p/foo"
@@ -16,7 +18,8 @@
   (is (= 0 (transforms/constant-transform-default false)))
 
   ;; Numbers and strings.
-  (is (= 1 (transforms/constant-transform-default 1.0)))
+  #?(:cljs (is (= 1 (transforms/constant-transform-default 1.0))))
+  #?(:clj  (is (= 1.0 (transforms/constant-transform-default 1.0))))
   (is (= -1 (transforms/constant-transform-default -1)))
   (is (= 42 (transforms/constant-transform-default 42)))
   (is (= "" (transforms/constant-transform-default "")))
diff --git a/test/datomish/test/util.cljc b/test/datomish/test/util.cljc
new file mode 100644
index 00000000..291f6761
--- /dev/null
+++ b/test/datomish/test/util.cljc
@@ -0,0 +1,20 @@
+(ns datomish.test.util
+  (:require
+     [datomish.util :as util]
+     #?(:clj  [clojure.test :as t :refer [is are deftest testing]])
+     #?(:cljs [cljs.test :as t :refer-macros [is are deftest testing]])
+     ))
+
+(deftest test-var-translation
+  (is (= :x (util/var->sql-var '?x)))
+  (is (= :XX (util/var->sql-var '?XX))))
+
+#?(:cljs
+     (deftest test-raise
+       (let [caught
+             (try
+               (do
+                 (util/raise "succeed")
+                 "fail")
+               (catch :default e e))]
+         (is (= "succeed" (aget caught "message"))))))
diff --git a/test/datomish/test/util.cljs b/test/datomish/test/util.cljs
deleted file mode 100644
index bc4bdef2..00000000
--- a/test/datomish/test/util.cljs
+++ /dev/null
@@ -1,17 +0,0 @@
-(ns datomish.test.util
-  (:require
-     [cljs.test :as t :refer-macros [is are deftest testing]]
-     [datomish.util :as util]))
-
-(deftest test-var-translation
-  (is (= :x (util/var->sql-var '?x)))
-  (is (= :XX (util/var->sql-var '?XX))))
-
-(deftest test-raise
-  (let [caught
-        (try
-          (do
-            (util/raise "succeed")
-            "fail")
-          (catch :default e e))]
-    (is (= "succeed" (aget caught "message")))))