diff --git a/Jenkinsfile b/Jenkinsfile
index 6ddc050..f793225 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,26 +8,18 @@ pipeline {
 
     stages {
         stage('Chibi primitives') {
-            environment {
-                COMPILE_R7RS = "chibi"
-                TESTNAME = "primitives"
-            }
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'docker build --build-arg COMPILE_R7RS=${COMPILE_R7RS} --tag=r7rs-pffi-test-${COMPILE_R7RS} -f dockerfiles/test .'
-                    sh 'docker run -v "${PWD}":/workdir -w /workdir -t r7rs-pffi-test-${COMPILE_R7RS} sh -c "make COMPILE_R7RS=${COMPILE_R7RS} test-compile-r7rs"'
+            agent {
+                dockerfile {
+                    filename 'dockerfiles/test'
+                    additionalbuildArgs '--build-arg COMPILE_R7RS=chibi'
                 }
             }
-        }
-        stage('Chibi addressof') {
             environment {
                 COMPILE_R7RS = "chibi"
-                TESTNAME = "addressof"
             }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'docker build --build-arg COMPILE_R7RS=${COMPILE_R7RS} --tag=r7rs-pffi-test-${COMPILE_R7RS} -f dockerfiles/test .'
-                    sh 'docker run -v "${PWD}":/workdir -w /workdir -t r7rs-pffi-test-${COMPILE_R7RS} sh -c "make COMPILE_R7RS=${COMPILE_R7RS} test-compile-r7rs"'
+                    sh 'make test-compile-r7rs COMPILE_R7RS=chibi TESTNAME=primitives'
                 }
             }
         }