diff --git a/Makefile b/Makefile
index 595f1e7..e166c0f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,10 @@ TMPDIR=.tmp/${SCHEME}
 PKG=srfi-${SRFI}-${VERSION}.tgz
 
 SFX=scm
+AKKU_PACKAGES=
 ifeq "${RNRS}" "r6rs"
 SFX=sps
+AKKU_PACKAGES="akku-r7rs"
 endif
 
 DOCKER_TAG=head
@@ -55,8 +57,8 @@ test: testfiles
 test-docker: testfiles
 	cd .tmp && \
 		DOCKER_TAG=${DOCKER_TAG} \
-		SNOW_PACKAGES="srfi.64 ${PKG}" \
-		AKKU_PACKAGES="akku-r7rs chez-srfi" \
+		SNOW_PACKAGES="srfi.19 srfi.64 foreign.c ${PKG}" \
+		AKKU_PACKAGES=${AKKU_PACKAGES} \
 		APT_PACKAGES="libcurl4-openssl-dev" \
 		COMPILE_R7RS=${SCHEME} \
 		TEST_R7RS_DEBUG=1 \
diff --git a/srfi/170/test.scm b/srfi/170/test.scm
index e783289..1ce7b78 100644
--- a/srfi/170/test.scm
+++ b/srfi/170/test.scm
@@ -10,13 +10,6 @@
 (test-assert (number? niceness))
 (test-assert (> niceness 0))
 
-(define ui (user-info "retropikzel"))
-(write ui)
-(newline)
-
-(write (user-info:parsed-full-name ui))
-(newline)
-
 #|
 (define tmp-dir "/tmp/foreign-c-srfi-170")
 (for-each
diff --git a/test-headers.sps b/test-headers.sps
index 788aba2..c0fcc90 100644
--- a/test-headers.sps
+++ b/test-headers.sps
@@ -1,4 +1,4 @@
 (import (rnrs)
         (srfi :64)
         (foreign c)
-        (srfi SRFI))
+        (srfi :SRFI))