diff --git a/basis/cairo/cairo-tests.factor b/basis/cairo/cairo-tests.factor
new file mode 100644
index 0000000000..bf7c468774
--- /dev/null
+++ b/basis/cairo/cairo-tests.factor
@@ -0,0 +1,8 @@
+IN: cairo.tests
+USING: cairo tools.test math.rectangles accessors ;
+
+[ { 10 20 } ] [
+    { 10 20 } [
+        { 0 1 } { 3 4 } <rect> fill-rect
+    ] make-bitmap-image dim>>
+] unit-test
\ No newline at end of file
diff --git a/basis/pango/layouts/layouts-tests.factor b/basis/pango/layouts/layouts-tests.factor
index 34aba6216e..5959eddb07 100644
--- a/basis/pango/layouts/layouts-tests.factor
+++ b/basis/pango/layouts/layouts-tests.factor
@@ -4,10 +4,8 @@ sequences combinators.short-circuit math destructors ;
 
 [ t ] [
     [
-        "OH, HAI"
         <font> "Helvetica" >>name 12 >>size
-        dummy-cairo
-        <layout> &g_object_unref
-        layout-dim
-    ] with-destructors [ { [ integer? ] [ 0 > ] } 1&& ] all?
+        "OH, HAI"
+        cached-layout ink-rect>> dim>>
+    ] with-destructors [ 0 > ] all?
 ] unit-test
\ No newline at end of file