diff --git a/lib/chibi/diff-test.sld b/lib/chibi/diff-test.sld
index 0d882ae3..c11f6575 100644
--- a/lib/chibi/diff-test.sld
+++ b/lib/chibi/diff-test.sld
@@ -2,6 +2,12 @@
 (define-library (chibi diff-test)
   (import (scheme base) (chibi diff) (chibi test))
   (export run-tests)
+  (cond-expand
+   (chibi (import (chibi test)))
+   (else
+    ;; avoid cyclic test deps in snow
+    (import (srfi 64))
+    (begin (define test test-equal))))
   (begin
     (define (run-tests)
       (test-begin "diff")
diff --git a/lib/chibi/optional-test.sld b/lib/chibi/optional-test.sld
index 1755831e..e815e8c1 100644
--- a/lib/chibi/optional-test.sld
+++ b/lib/chibi/optional-test.sld
@@ -1,6 +1,12 @@
 
 (define-library (chibi optional-test)
   (import (scheme base) (chibi optional) (chibi test))
+  (cond-expand
+   (chibi (import (chibi test)))
+   (else
+    ;; avoid cyclic test deps in snow
+    (import (srfi 64))
+    (begin (define test test-equal))))
   (export run-tests)
   (begin
     (define (run-tests)