diff --git a/Jenkinsfile b/Jenkinsfile
index a9c5496..6379bad 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
                 stage('R6RS x86_64 Debian') {
                     steps {
                         script {
-                            stages {
-                                params.LIBRARIES.split().each { LIBRARY ->
+                            params.LIBRARIES.split().each { LIBRARY ->
+                                stage("${LIBRARY}") {
                                     params.R6RS_SCHEMES.split().each { SCHEME ->
                                         def IMG="${SCHEME}:head"
                                         stage("${SCHEME} - ${LIBRARY}") {
@@ -49,14 +49,16 @@ pipeline {
                     steps {
                         script {
                             params.LIBRARIES.split().each { LIBRARY ->
-                                params.R7RS_SCHEMES.split().each { SCHEME ->
-                                    def IMG="${SCHEME}:head"
-                                    if("${SCHEME}" == "chicken") {
-                                        IMG="${SCHEME}:5"
-                                    }
-                                    stage("${SCHEME} - ${LIBRARY}") {
-                                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                            sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker"
+                                stage("${LIBRARY}") {
+                                    params.R7RS_SCHEMES.split().each { SCHEME ->
+                                        def IMG="${SCHEME}:head"
+                                        if("${SCHEME}" == "chicken") {
+                                            IMG="${SCHEME}:5"
+                                        }
+                                        stage("${SCHEME} - ${LIBRARY}") {
+                                            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                                sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker"
+                                            }
                                         }
                                     }
                                 }