diff --git a/Jenkinsfile b/Jenkinsfile
index 7fac2a6..fa3f26c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,8 @@ pipeline {
         stage('Tests') {
             steps {
                 script {
-                    def implementations = sh(script: 'docker run retropikzel1/compile-r7rs sh -c "compile-r7rs --list-r7rs-schemes"', returnStdout: true).split()
+                    //def implementations = sh(script: 'docker run retropikzel1/compile-r7rs:chibi sh -c "compile-r7rs --list-r7rs-schemes"', returnStdout: true).split()
+                    def implementations = "chibi chicken gauche guile kawa mosh racket sagittarius stklos ypsilon".split()
 
                     parallel implementations.collectEntries { implementation->
                         [(implementation): {
diff --git a/dockerfiles/Dockerfile.test b/dockerfiles/Dockerfile.test
index 362c10d..f461533 100644
--- a/dockerfiles/Dockerfile.test
+++ b/dockerfiles/Dockerfile.test
@@ -1,16 +1,3 @@
-ARG SCHEME=chibi
-ARG IMAGE=chibi:head
-FROM schemers/chibi:head AS build
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    git \
-    make \
-    build-essential
-RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
-RUN cd chibi-scheme && make -j 32
-RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
-RUN cd compile-r7rs && make
-
 ARG SCHEME=chibi
 ARG IMAGE=chibi:head
 FROM schemers/${IMAGE}
@@ -22,10 +9,8 @@ RUN apt-get update && apt-get install -y \
     libffi-dev \
     pandoc
 RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
-COPY --from=build /chibi-scheme /chibi-scheme
-RUN cd /chibi-scheme && make -j 8 install
-COPY --from=build /compile-r7rs /compile-r7rs
-RUN cd /compile-r7rs && make install
+COPY --from=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