diff --git a/Jenkinsfile b/Jenkinsfile
index 4c53684..805b9e7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent {
         docker {
-            image 'retropikzel1/compile-r7rs'
+            image 'retropikzel1/snow-test'
             label 'docker-x86_64'
             args '--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock'
         }
@@ -24,8 +24,7 @@ pipeline {
                                 if("${SCHEME}" == "chicken") {
                                     DOCKERIMG="chicken:5"
                                 }
-                                sh "docker run -v ${WORKSPACE}:/workdir -w /workdir schemers/${DOCKERIMG} sh -c \"make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes all install test\""
-                                archiveArtifacts artifacts: 'logs/*.log', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: true
+                                sh "snow-test ${SCHEME} test.scm"
                             }
                         }
                     }
diff --git a/Makefile b/Makefile
index bb0acbe..9a56f35 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ DOCKERIMG=${SCHEME}:head
 VERSION=0.10.7
 CC=gcc
 TMPDIR=.tmp
+PKGNAME=foreign-c-${VERSION}.tgz
 
 ifeq "${SCHEME}" "chicken"
 DOCKERIMG=${SCHEME}:5
@@ -38,7 +39,7 @@ install: package
 uninstall:
 	snow-chibi --impls=${SCHEME} remove "(foreign c)"
 
-test: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest.a
+test-old: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest.a
 	cp -r foreign ${TMPDIR}/test/
 	cp tests/*.scm ${TMPDIR}/test/
 	cp tests/c-include/libtest.h ${TMPDIR}/test/
@@ -47,6 +48,9 @@ test: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest.
 		COMPILE_R7RS=${SCHEME} timeout 600 compile-r7rs -o test test.scm
 	cd ${TMPDIR}/test && printf "\n" | LD_LIBRARY_PATH=. timeout 600 ./test
 
+test: package
+	snow-test ${SCHEME} ${PKGNAME}
+
 test-docker:
 	docker run -it -v "${PWD}:/workdir" -w /workdir retropikzel1/compile-r7rs sh -c \
 		"make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes install test"