diff --git a/Jenkinsfile b/Jenkinsfile
index 3d0777b..a83aa88 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,18 +8,11 @@ pipeline {
 
     stages {
         stage('Chibi primitives') {
-            agent {
-                dockerfile {
-                    filename 'Dockerfile.test'
-                    additionalBuildArgs '--build-arg COMPILE_R7RS=chibi'
-                }
-            }
-            environment {
-                COMPILE_R7RS = "chibi"
-            }
+            agent { docker { image 'schemers/chibi' } }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make test-compile-r7rs COMPILE_R7RS=chibi TESTNAME=primitives'
+                    sh 'apt update && apt install -y make'
+                    sh 'make test-compile-r7rs-docker COMPILE_R7RS=chibi TESTNAME=primitives'
                 }
             }
         }