diff --git a/Jenkinsfile b/Jenkinsfile
index bd3dd8b..11ece57 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,10 +36,12 @@ pipeline {
             steps {
                 script {
                     env.LIBRARIES.split().each { LIBRARY ->
-                        env.R6RS_SCHEMES.split().each { SCHEME ->
-                            stage("${SCHEME} ${LIBRARY}") {
-                                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                    sh "make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r6rs test-docker"
+                        stage("${LIBRARY}") {
+                            env.R6RS_SCHEMES.split().each { SCHEME ->
+                                stage("${SCHEME}") {
+                                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                        sh "make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r6rs test-docker"
+                                    }
                                 }
                             }
                         }
@@ -51,10 +53,12 @@ pipeline {
             steps {
                 script {
                     env.LIBRARIES.split().each { LIBRARY ->
-                        env.R7RS_SCHEMES.split().each { SCHEME ->
-                            stage("${SCHEME} ${LIBRARY}") {
-                                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                    sh "make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r7rs test-docker"
+                        stage("${LIBRARY}") {
+                            env.R7RS_SCHEMES.split().each { SCHEME ->
+                                stage("${SCHEME}") {
+                                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                        sh "make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r7rs test-docker"
+                                    }
                                 }
                             }
                         }
diff --git a/Makefile b/Makefile
index 828be55..29bda37 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ LIBRARY=system
 AUTHOR=Retropikzel
 
 SFX=scm
-LIB_PATHS=-I .
+LIB_PATHS=
 ifeq "${RNRS}" "r6rs"
 SFX=sps
 LIB_PATHS=-I .akku/lib
diff --git a/retropikzel/download-file/APT_PACKAGES b/retropikzel/download-file/APT_PACKAGES
new file mode 100644
index 0000000..1ce3f6b
--- /dev/null
+++ b/retropikzel/download-file/APT_PACKAGES
@@ -0,0 +1 @@
+libcurl4-openssl-dev
diff --git a/retropikzel/download-file/PACKAGE_ARGS b/retropikzel/download-file/PACKAGE_ARGS
new file mode 100644
index 0000000..1420ad2
--- /dev/null
+++ b/retropikzel/download-file/PACKAGE_ARGS
@@ -0,0 +1 @@
+--foreign-depends curl