diff --git a/Dockerfile.test b/Dockerfile.test
index d463cbb..697d82f 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -10,7 +10,9 @@ RUN apt-get update && apt-get install -y \
 COPY --from=schemers/loko:head /usr/local /usr/loko
 RUN cp -r /usr/loko/* /usr/local/
 COPY --from=schemers/chibi:head /usr/local /usr/chibi
-RUN cp -r /usr/chibi/* /usr/local/
+RUN cp -r /usr/chibi/lib/* /usr/local/lib/
+RUN cp -r /usr/chibi/share/* /usr/local/share/
+RUN cp -r /usr/chibi/bin/*chibi* /usr/local/bin/
 RUN ldconfig
 
 ADD https://codeberg.org/retropikzel/compile-r7rs/raw/branch/main/compile-r7rs .
diff --git a/Makefile b/Makefile
index 5ab2d8c..9253a73 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ VERSION=$(shell cat retropikzel/${LIBRARY}/VERSION)
 DESCRIPTION=$(shell head -n1 retropikzel/${LIBRARY}/README.md)
 README=retropikzel/${LIBRARY}/README.html
 TESTFILE=retropikzel/${LIBRARY}/test.scm
-TEST_DEPENDS=srfi.64 retropikzel.mouth retropikzel.ctrf
 
 SFX=scm
 SNOW=snow-chibi --impls=${SCHEME} install --skip-tests?=1 --always-yes
@@ -43,8 +42,11 @@ test: logs build index
 	rm -rf .tmp
 	mkdir -p .tmp
 	cat test-headers.${SFX} ${TESTFILE} | sed 's/LIBRARY/${LIBRARY}/' > .tmp/test.${SFX}
-	cd .tmp && ${SNOW} ${TEST_DEPENDS} retropikzel.${LIBRARY}
-	cd .tmp && akku install akku-r7rs
+	cd .tmp && ${SNOW} srfi.64
+	cd .tmp && ${SNOW} retropikzel.mouth
+	cd .tmp && ${SNOW} retropikzel.ctrf
+	cd .tmp && ${SNOW} retropikzel.${LIBRARY}
+	cd .tmp && akku install akku-r7rs 2> /dev/null
 	cd .tmp && COMPILE_R7RS=${SCHEME} CSC_OPTIONS="-L -lcurl" compile-r7rs ${LIB_PATHS} -o test test.${SFX};
 	cd .tmp && ./test
 	mv .tmp/*.json logs/ || true
diff --git a/retropikzel/ctrf.sld b/retropikzel/ctrf.sld
index 10ad544..016bb74 100644
--- a/retropikzel/ctrf.sld
+++ b/retropikzel/ctrf.sld
@@ -36,7 +36,8 @@
     (racket (begin (define implementation-name "racket")))
     (sagittarius (begin (define implementation-name "sagittarius")))
     (skint (begin (define implementation-name "skint")))
-    (stklos (begin (define implementation-name "stklos")))
+    (stklos (begin (define implementation-name "stklos"))
+            (export ctrf-runner))
     (tr7 (begin (define implementation-name "tr7")))
     (ypsilon (begin (define implementation-name "ypsilon")))
     (else (begin (define implementation-name "unknown"))))
diff --git a/retropikzel/ctrf/VERSION b/retropikzel/ctrf/VERSION
index 26aaba0..6085e94 100644
--- a/retropikzel/ctrf/VERSION
+++ b/retropikzel/ctrf/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.1