diff --git a/Dockerfile.test b/Dockerfile.test
index 5f19b94..f262fe1 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -37,14 +37,12 @@ WORKDIR /build/akku
 RUN bash install.sh
 ENV PATH=/root/.local/bin:${PATH}
 RUN akku update
-RUN akku install chez-srfi akku-r7rs "(foreign c)"
 WORKDIR /workdir
 RUN mkdir -p srfi
 RUN for srfi in 60 64 180; do cp /build/r7rs-srfi/srfi/${srfi}.* srfi/ && cp /build/r7rs-srfi/srfi/srfi-${srfi}.* srfi/; done
 RUN mkdir -p libs/srfi
-RUN for srfi in 60 64 145 180; do cp /build/r7rs-srfi/srfi/${srfi}.* srfi/ && cp /build/r7rs-srfi/srfi/srfi-${srfi}.* libs/srfi/; done
-RUN if [ "${SCHEME}" = "skint" ]; then cp -r /build/r7rs-srfi/srfi/39.* srfi/; fi
-RUN if [ "${SCHEME}" = "tr7" ]; then cp -r /build/r7rs-srfi/srfi/39.* srfi/; fi
+RUN for srfi in 39 60 64 145 180; do cp /build/r7rs-srfi/srfi/${srfi}.* srfi/ && cp /build/r7rs-srfi/srfi/srfi-${srfi}.* libs/srfi/; done
+RUN if [ "${SCHEME}" = "chibi" ]; then rm -rf .libs/srfi/39.*; fi
 COPY Makefile .
 COPY retropikzel retropikzel/
 COPY retropikzel libs/retropikzel/
diff --git a/Jenkinsfile b/Jenkinsfile
index b3ae438..5e0d02f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
         stage('R7RS tests') {
             steps {
                 script {
-                    def implementations = sh(script: 'compile-scheme --list-r7rs-except gambit larceny', returnStdout: true).split()
+                    def implementations = sh(script: 'compile-scheme --list-r7rs-except cyclone foment gambit larceny', returnStdout: true).split()
                     params.LIBRARIES.split().each { LIBRARY ->
                         stage("${LIBRARY}") {
                             parallel implementations.collectEntries { SCHEME ->