diff --git a/Dockerfile.test b/Dockerfile.test
index 8e7b3b2..095c8e4 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -38,9 +38,9 @@ RUN bash install.sh
 ENV PATH=/root/.local/bin:${PATH}
 RUN akku update
 WORKDIR /workdir
+RUN snow-chibi install --impls=${SCHEME} --always-yes "(srfi 64)"
+RUN snow-chibi install --impls=${SCHEME} --always-yes "(srfi 180)"
 RUN mkdir -p srfi
-RUN for srfi in 39 60 64 145 180; do cp /build/r7rs-srfi/srfi/${srfi}.* srfi/ && cp /build/r7rs-srfi/srfi/srfi-${srfi}.* srfi/; done
-RUN if [ "${SCHEME}" = "chibi" ]; then rm -rf srfi/39.*; fi
 COPY Makefile .
 COPY retropikzel retropikzel/
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 3cfa341..1df176d 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 skint larceny', returnStdout: true).split()
+                    def implementations = sh(script: 'compile-scheme --list-r7rs-except cyclone foment gambit meevax skint larceny tr7', returnStdout: true).split()
                     params.LIBRARIES.split().each { LIBRARY ->
                         stage("${LIBRARY}") {
                             parallel implementations.collectEntries { SCHEME ->
diff --git a/Makefile b/Makefile
index b39a113..1233bd1 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@ ${TMPDIR}:
 test-r6rs: ${TMPDIR}
 	cd ${TMPDIR} && printf "#!r6rs\n(import (rnrs base) (rnrs control) (rnrs io simple) (rnrs files) (rnrs programs) (srfi :64) (retropikzel ${LIBRARY}))\n" > test-r6rs.sps
 	cat ${TESTFILE} >> ${TMPDIR}/test-r6rs.sps
+	cd ${TMPDIR} && snow-chibi install --impls=generic --always-yes --install-source-dir=. --install-library-dir=. "(srfi 180)"
 	cd ${TMPDIR} && akku install chez-srfi akku-r7rs
 	cd ${TMPDIR} && COMPILE_R7RS=${SCHEME} timeout 120 compile-scheme -I .akku/lib -o test-r6rs test-r6rs.sps
 	cd ${TMPDIR} && timeout 60 ./test-r6rs