diff --git a/Jenkinsfile b/Jenkinsfile
index bbe0f34..34e11a4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,14 +19,14 @@ pipeline {
                             stage("${implementation} ${test}") {
                                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                     sh "timeout 600 docker build --build-arg COMPILE_R7RS=${implementation} --tag=r7rs-pffi-test-${implementation} -f dockerfiles/Dockerfile.test ."
-                                    sh "timeout 600 docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make COMPILE_R7RS=${implementation} TESTNAME=primitives test-compile-r7rs\""
+                                    sh "timeout 600 docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make SCHEME=${implementation} TEST=primitives test\""
                                 }
                             }
                         }
                         stage("${implementation} snow-chibi install test") {
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                sh "timeout 600 docker build --build-arg COMPILE_R7RS=${implementation} --tag=r7rs-pffi-test-${implementation} -f dockerfiles/Dockerfile.snow-chibi-install-test ."
-                                sh "timeout 600 docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make build install-jenkins COMPILE_R7RS=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && COMPILE_R7RS=${implementation} compile-r7rs -o hello hello.scm && ./hello\""
+                                sh "timeout 600 docker build --build-arg SCHEME=${implementation} --tag=r7rs-pffi-test-${implementation} -f dockerfiles/Dockerfile.snow-chibi-install-test ."
+                                sh "timeout 600 docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make build install-jenkins SCHEME=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && SCHEME=${implementation} compile-r7rs -o hello hello.scm && ./hello\""
                             }
                         }
                     }
diff --git a/dockerfiles/Dockerfile.test b/dockerfiles/Dockerfile.test
index 59de740..3452a12 100644
--- a/dockerfiles/Dockerfile.test
+++ b/dockerfiles/Dockerfile.test
@@ -1,5 +1,5 @@
-ARG COMPILE_R7RS=chibi
-FROM schemers/${COMPILE_R7RS}
+ARG SCHEME=chibi
+FROM schemers/${SCHEME}
 RUN apt-get update && apt-get install -y \
     build-essential \
     git \
@@ -16,5 +16,5 @@ RUN chicken-install r7rs
 RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
 RUN cd compile-r7rs && make && make install
 ARG COMPILE_R7RS=chibi
-ENV COMPILE_R7RS=${COMPILE_R7RS}
+ENV COMPILE_R7RS=${SCHEME}