diff --git a/Jenkinsfile b/Jenkinsfile
index b2d8d6b..7d0d7d8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,18 +10,18 @@ pipeline {
     }
 
     stages {
-        stage('Testing') {
+        stage('chibi') {
+            agent {
+                dockerfile {
+                    filename 'Dockerfile.test'
+                        args '--user=root'
+                        additionalBuildArgs "--build-arg COMPILE_R7RS=${STAGE_NAME}"
+                }
+            }
             steps {
                 script {
-                    implementations.each { implementation ->
-                        agent {
-                            dockerfile {
-                                filename 'Dockerfile.test'
-                                    args '--user=root'
-                                    additionalBuildArgs "--build-arg COMPILE_R7RS=${implementation}"
-                            }
-                        }
-                        stage("${implementation} primitives") {
+                    tests.each { test ->
+                        stage("${STAGE_NAME} ${test}") {
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                 echo "hello"
                             }