diff --git a/Jenkinsfile b/Jenkinsfile
index 4420c5b..81a65f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,120 +7,17 @@ pipeline {
     }
 
     stages {
-        stage('Chibi') {
+        stage('Chibi primitives') {
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make COMPILE_R7RS=chibi test-compile-r7rs-docker'
+                    sh 'make test-compile-r7rs-docker COMPILE_R7RS=chibi TESTNAME=primitives'
                 }
             }
         }
-        stage('Build Chibi libraries') {
-            agent {
-                dockerfile {
-                    filename 'dockerfiles/build-chibi'
-                }
-            }
+        stage('Chibi addressof') {
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make cbibi'
-                }
-            }
-        }
-        stage('chibi script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=chibi test-script-docker'
-                }
-            }
-        }
-        stage('chicken script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=chicken test-script-docker'
-                }
-            }
-        }
-        stage('guile script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=guile test-script-docker'
-                }
-            }
-        }
-        stage('kawa script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=kawa test-script-docker'
-                }
-            }
-        }
-        stage('mosh script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=mosh test-script-docker'
-                }
-            }
-        }
-        stage('racket script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=racket test-script-docker'
-                }
-            }
-        }
-        stage('sagittarius script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=sagittarius test-script-docker'
-                }
-            }
-        }
-        stage('stklos script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=stklos test-script-docker'
-                }
-            }
-        }
-        stage('ypsilon script') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=ypsilon test-script-docker'
-                }
-            }
-        }
-        stage('chicken compile') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=chicken test-compile-docker'
-                }
-            }
-        }
-        stage('cyclone compile') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=cyclone test-compile-docker'
-                }
-            }
-        }
-        stage('gambit compile') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=gambit test-compile-docker'
-                }
-            }
-        }
-        stage('kawa compile') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=kawa test-compile-docker'
-                }
-            }
-        }
-        stage('racket compile') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'make SCHEME=racket test-compile-docker'
+                    sh 'make test-compile-r7rs-docker COMPILE_R7RS=chibi TESTNAME=addressof'
                 }
             }
         }