diff --git a/lib/chibi/diff-test.sld b/lib/chibi/diff-test.sld
index c11f6575..534ff81d 100644
--- a/lib/chibi/diff-test.sld
+++ b/lib/chibi/diff-test.sld
@@ -5,9 +5,25 @@
   (cond-expand
    (chibi (import (chibi test)))
    (else
-    ;; avoid cyclic test deps in snow
-    (import (srfi 64))
-    (begin (define test test-equal))))
+    ;; inline (chibi test) to avoid circular dependencies in snow
+    ;; installations
+    (define-syntax test
+      (syntax-rules ()
+        ((test expect expr)
+         (test 'expr expect expr))
+        ((test name expect expr)
+         (guard (exn (else (display "!\nERROR: ") (write name) (newline)
+                           (write exn) (newline)))
+           (let* ((res expr)
+                  (pass? (equal? expect expr)))
+             (display (if pass? "." "x"))
+             (cond
+              ((not pass?)
+               (display "\nFAIL: ") (write name) (newline))))))))
+    (define (test-begin name)
+      (display name))
+    (define (test-end)
+      (newline))))
   (begin
     (define (run-tests)
       (test-begin "diff")
diff --git a/lib/chibi/optional-test.sld b/lib/chibi/optional-test.sld
index e815e8c1..845576e7 100644
--- a/lib/chibi/optional-test.sld
+++ b/lib/chibi/optional-test.sld
@@ -4,9 +4,29 @@
   (cond-expand
    (chibi (import (chibi test)))
    (else
-    ;; avoid cyclic test deps in snow
-    (import (srfi 64))
-    (begin (define test test-equal))))
+    ;; inline (chibi test) to avoid circular dependencies in snow
+    ;; installations
+    (define-syntax test
+      (syntax-rules ()
+        ((test expect expr)
+         (test 'expr expect expr))
+        ((test name expect expr)
+         (guard (exn (else (display "!\nERROR: ") (write name) (newline)
+                           (write exn) (newline)))
+           (let* ((res expr)
+                  (pass? (equal? expect expr)))
+             (display (if pass? "." "x"))
+             (cond
+              ((not pass?)
+               (display "\nFAIL: ") (write name) (newline))))))))
+    (define-syntax test-error
+      (syntax-rules ()
+        ((test-error expr)
+         (test-assert (guard (exn (else #t)) expr #f)))))
+    (define (test-begin name)
+      (display name))
+    (define (test-end)
+      (newline))))
   (export run-tests)
   (begin
     (define (run-tests)