diff --git a/Jenkinsfile b/Jenkinsfile
index 6358213..7da16fb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,7 +30,6 @@ pipeline {
                                     stage("${SCHEME}") {
                                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                             sh "timeout 6000 make SCHEME=${SCHEME} clean test-docker"
-                                            archiveArtifacts artifacts: 'tmp/*/*.log', fingerprint: true
                                         }
                                     }
                                 }]
@@ -40,5 +39,11 @@ pipeline {
                 }
             }
         }
+
+        post {
+            always {
+                archiveArtifacts artifacts: '*.log', fingerprint: true
+            }
+        }
     }
 }
diff --git a/Makefile b/Makefile
index ce5dbef..231ae3f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,7 @@ test: ${TMPDIR}
 	echo "Hello"
 	cd ${TMPDIR} && COMPILE_R7RS=${SCHEME} compile-r7rs -I . -o test test.scm
 	cd ${TMPDIR} && ./test
+	cp ${TMPDIR}/foreign-c-${LIBRARY}.log ${SCHEME}-foreign-c-${LIBRARY}.log
 
 test-docker: ${TMPDIR}
 	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-library-test-${SCHEME} -f Dockerfile.test . 2> ${TMPDIR}/docker.log || cat ${TMPDIR}/docker.log