diff --git a/Jenkinsfile b/Jenkinsfile
index 545f921..6ddc050 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,10 +1,5 @@
 pipeline {
-    agent {
-        dockerfile {
-            filename 'dockerfiles/jenkins'
-            args '--user=root'
-        }
-    }
+    agent any
 
     options {
         disableConcurrentBuilds()
@@ -13,16 +8,26 @@ pipeline {
 
     stages {
         stage('Chibi primitives') {
+            environment {
+                COMPILE_R7RS = "chibi"
+                TESTNAME = "primitives"
+            }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make test-compile-r7rs-docker COMPILE_R7RS=chibi TESTNAME=primitives'
+                    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"'
                 }
             }
         }
         stage('Chibi addressof') {
+            environment {
+                COMPILE_R7RS = "chibi"
+                TESTNAME = "addressof"
+            }
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make test-compile-r7rs-docker COMPILE_R7RS=chibi TESTNAME=addressof'
+                    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"'
                 }
             }
         }