diff --git a/Dockerfile.test b/Dockerfile.test
index a99856e..9ba8602 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -11,20 +11,16 @@ RUN wget https://gitlab.com/-/project/6808260/uploads/094ce726ce3c6cf8c14560f1e3
 #RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=2
 RUN git clone https://github.com/Retropikzel/chibi-scheme.git --branch=snow-chibi-kawa-fixes --depth=1
 RUN git clone https://codeberg.org/retropikzel/compile-scheme.git --depth=2
-RUN git clone https://github.com/srfi-explorations/r7rs-srfi.git --branch=retropikzel-fixes --depth=4
 WORKDIR /build/chibi-scheme
 RUN make
 RUN make install
 WORKDIR /build/compile-scheme
 RUN make build-gauche
-WORKDIR /build
-RUN git clone https://codeberg.org/foreign-c/foreign-c.git --depth=2
 
 ARG SCHEME=chibi
 ARG IMAGE=${SCHEME}:head
 FROM schemers/${IMAGE}
-RUN apt-get update && apt-get install -y \
-    make gcc libffi-dev libcurl4 gauche jq git ca-certificates
+RUN apt-get update && apt-get install -y make gcc libffi-dev libcurl4 gauche
 RUN mkdir ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
 COPY --from=build /build /build
 ARG SCHEME=chibi
@@ -32,19 +28,12 @@ WORKDIR /build/compile-scheme
 RUN make install
 WORKDIR /build/chibi-scheme
 RUN make install
-WORKDIR /build/chibi-scheme
-RUN make install
 WORKDIR /build/akku
 RUN bash install.sh
 ENV PATH=/root/.local/bin:${PATH}
 RUN akku update
-WORKDIR /build/r7rs-srfi
-RUN make SCHEME=${SCHEME} SRFI=60 SNOW_CHIBI_ARGS=--always-yes build install
-RUN make SCHEME=${SCHEME} SRFI=39 SNOW_CHIBI_ARGS=--always-yes build install
-RUN make SCHEME=${SCHEME} SRFI=64 SNOW_CHIBI_ARGS=--always-yes build install
-RUN make SCHEME=${SCHEME} SRFI=145 SNOW_CHIBI_ARGS=--always-yes build install
-RUN make SCHEME=${SCHEME} SRFI=180 SNOW_CHIBI_ARGS=--always-yes build install
 WORKDIR /workdir
+RUN snow-chibi --impls=${SCHEME} --always-yes install "(srfi 180)"
 COPY Makefile .
 COPY retropikzel retropikzel/
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 1df176d..46621b0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
         stage('R7RS tests') {
             steps {
                 script {
-                    def implementations = sh(script: 'compile-scheme --list-r7rs-except cyclone foment gambit meevax skint larceny tr7', returnStdout: true).split()
+                    def implementations = sh(script: 'compile-scheme --list-r7rs-except capyscheme cyclone foment gambit meevax skint larceny tr7', returnStdout: true).split()
                     params.LIBRARIES.split().each { LIBRARY ->
                         stage("${LIBRARY}") {
                             parallel implementations.collectEntries { SCHEME ->