diff --git a/Dockerfile.test b/Dockerfile.test
index d5ff4b5..99d32c9 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,25 +1,22 @@
+ARG SCHEME=chibi
+ARG IMAGE=chibi:head
+FROM docker.io/debian:trixie-slim AS local-chibi
+RUN apt-get update && apt-get install -y git ca-certificates make gcc libc-dev
+#RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
+RUN git clone https://github.com/Retropikzel/chibi-scheme.git --branch gauche-fixes --depth=1
+RUN cd chibi-scheme && make DESTDIR=/opt/chibi -j16 && make DESTDIR=/opt/chibi -j16 install
+
 ARG SCHEME=chibi
 ARG IMAGE=chibi:head
 FROM docker.io/schemers/${IMAGE}
-RUN apt-get update && apt-get install \
-    --no-install-suggests \
-    --no-install-recommends \
-    -y \
-    gcc \
-    libc6-dev \
-    make \
-    libffi-dev \
-    pandoc \
-    libmbedtls-dev \
-    tree \
-    git \
-    ca-certificates
-RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
-#RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
-RUN git clone https://github.com/Retropikzel/chibi-scheme.git --branch gauche-fixes
-RUN cd chibi-scheme && make && make install
+RUN apt-get update && apt-get install -y make pandoc libffi-dev
+COPY --from=local-chibi /opt/chibi /opt/chibi
 COPY --from=docker.io/retropikzel1/compile-r7rs /opt/compile-r7rs /opt/compile-r7rs
-ENV PATH=/opt/compile-r7rs/bin:${PATH}
 ARG SCHEME=chibi
 ENV COMPILE_R7RS=${SCHEME}
 ENV GUILE_AUTO_COMPILE=0
+RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
+ENV CHIBI_MODULE_PATH=/opt/chibi/usr/local/share/chibi:/opt/chibi/usr/local/lib/chibi
+ENV LD_LIBRARY_PATH=/opt/chibi/usr/local/lib:/opt/chibi/usr/local/lib/chibi
+ENV PATH=/opt/compile-r7rs/bin:/opt/chibi/usr/local/bin:${PATH}
+