diff --git a/src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.test b/src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.test
index f68b2bbe..4436c569 100644
--- a/src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.test
+++ b/src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.test
@@ -4,11 +4,8 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
-cd "${BUILDDIR}/build-static-analysis"
-scan-build -o ../scan-build-reports -v --status-bugs make -j 4 everything
-cd ..
-pwd
-echo scp -o "StrictHostKeyChecking no" -i ./400-static-analysis -r scan-build-reports static-analysis@getdnsapi.net:scan-build-resports-$$-`date +%s`
-scp -o "StrictHostKeyChecking no" -i ./400-static-analysis -r scan-build-reports static-analysis@getdnsapi.net:scan-build-resports-$$-`date +%s`
-echo Copy done
-
+(
+	cd "${BUILDDIR}/build-static-analysis"
+	scan-build -o ../scan-build-reports -v --status-bugs make -j 4 everything
+)
+scp -o "StrictHostKeyChecking no" -i ./400-static-analysis -r "${BUILDDIR}/scan-build-reports" static-analysis@getdnsapi.net:scan-build-resports-$$-`date +%s`