diff --git a/Jenkinsfile b/Jenkinsfile
index c7dbec9..d1c2e7e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,6 +15,7 @@ pipeline {
     parameters {
         string(name: 'R7RS_SCHEMES', defaultValue: 'chibi chicken gauche guile kawa mosh racket sagittarius stklos ypsilon', description: '')
         string(name: 'R6RS_SCHEMES', defaultValue: 'chezscheme guile ikarus ironscheme mosh racket sagittarius ypsilon', description: '')
+        string(name: 'LIBRARIES', defaultValue: 'system', description: '')
     }
 
     stages {
@@ -29,11 +30,13 @@ pipeline {
                 stage('R6RS x86_64 Debian') {
                     steps {
                         script {
-                            params.R6RS_SCHEMES.split().each { SCHEME ->
-                                def IMG="${SCHEME}:head"
-                                stage("${SCHEME}") {
-                                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                        sh "timeout 6000 make SCHEME=${SCHEME} test-r6rs-docker"
+                            params.LIBRARIES.split().each { LIBRARY ->
+                                params.R6RS_SCHEMES.split().each { SCHEME ->
+                                    def IMG="${SCHEME}:head"
+                                    stage("${SCHEME} - ${LIBRARY}") {k
+                                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                            sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r6rs-docker"
+                                        }
                                     }
                                 }
                             }
@@ -43,14 +46,16 @@ pipeline {
                 stage('R7RS x86_64 Debian') {
                     steps {
                         script {
-                            params.R7RS_SCHEMES.split().each { SCHEME ->
-                                def IMG="${SCHEME}:head"
-                                if("${SCHEME}" == "chicken") {
-                                    IMG="${SCHEME}:5"
-                                }
-                                stage("${SCHEME}") {
-                                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                        sh "timeout 6000 make SCHEME=${SCHEME} test-r7rs-docker"
+                            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 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker"
+                                        }
                                     }
                                 }
                             }