diff --git a/test/uxbox/util/geom_tests.cljs b/test/uxbox/util/geom_tests.cljs
new file mode 100644
index 000000000..c716df19d
--- /dev/null
+++ b/test/uxbox/util/geom_tests.cljs
@@ -0,0 +1,85 @@
+(ns uxbox.util.geom-tests
+  (:require [cljs.test :as t :include-macros true]
+            [cljs.pprint :refer (pprint)]
+            [uxbox.util.geom.point :as gpt]
+            [uxbox.util.geom.matrix :as gmt]))
+
+(t/deftest point-constructors-test
+  (let [p (gpt/point 1 2)]
+    (t/is (= (:x p) 1))
+    (t/is (= (:y p) 2))
+    (t/is (gpt/point? p)))
+
+  (let [p (gpt/point 1)]
+    (t/is (= (:x p) 1))
+    (t/is (= (:y p) 1)))
+
+  (let [p (gpt/point)]
+    (t/is (= (:x p) 0))
+    (t/is (= (:y p) 0)))
+
+  (let [p (gpt/point [1 2])]
+    (t/is (= (:x p) 1))
+    (t/is (= (:y p) 2))))
+
+(t/deftest point-rotate-test
+  (let [p1 (gpt/point 10 0)
+        p2 (gpt/rotate p1 90)]
+    (t/is (= (:x p2) 0))
+    (t/is (= (:y p2) 10))
+    (t/is (gpt/point? p2))))
+
+(t/deftest point-add-test
+  (let [p1 (gpt/point 1 1)
+        p2 (gpt/point 2 2)
+        p3 (gpt/add p1 p2)]
+    (t/is (= (:x p3) 3))
+    (t/is (= (:y p3) 3))
+    (t/is (gpt/point? p3))))
+
+(t/deftest point-substract-test
+  (let [p1 (gpt/point 3 3)
+        p2 (gpt/point 2 2)
+        p3 (gpt/substract p1 p2)]
+    (t/is (= (:x p3) 1))
+    (t/is (= (:y p3) 1))
+    (t/is (gpt/point? p3))))
+
+(t/deftest point-distance-test
+  (let [p1 (gpt/point 0 0)
+        p2 (gpt/point 10 0)
+        d (gpt/distance p1 p2)]
+    (t/is (number? d))
+    (t/is (= d 10))))
+
+(t/deftest point-length-test
+  (let [p1 (gpt/point 10 0)
+        ln (gpt/length p1)]
+    (t/is (number? ln))
+    (t/is (= ln 10))))
+
+(t/deftest point-angle-test
+  (let [p1 (gpt/point 0 10)
+        angle (gpt/angle p1)]
+    (t/is (number? angle))
+    (t/is (= angle 90)))
+  (let [p1 (gpt/point 0 10)
+        p2 (gpt/point 10 10)
+        angle (gpt/angle p1 p2)]
+    (t/is (number? angle))
+    (t/is (= angle 45))))
+
+(t/deftest point-quadrant-test
+  (let [p1 (gpt/point 10 10)
+        p2 (gpt/point -10 10)
+        p3 (gpt/point -10 -10)
+        p4 (gpt/point 10 -10)]
+
+    (t/is (= 1 (gpt/quadrant p1)))
+    (t/is (= 2 (gpt/quadrant p2)))
+    (t/is (= 3 (gpt/quadrant p3)))
+    (t/is (= 4 (gpt/quadrant p4)))))
+
+
+
+