diff --git a/test/ci-runtests.sh b/test/ci-runtests.sh
index c794b7538108..698c54ae1034 100755
--- a/test/ci-runtests.sh
+++ b/test/ci-runtests.sh
@@ -211,7 +211,7 @@ echo "* Building test runner"
 echo "**********************************"
 
 # Clean up packages. Try to keep ones that match the versions we're testing
-find "$PACKAGES_DIR/" -type f ! \( -name "*${OLD_APP_VERSION}*" -o -name "*${commit}*" \) -delete || true
+find "$PACKAGES_DIR/" -type f ! \( -name "*${OLD_APP_VERSION}_*" -o -name "*${OLD_APP_VERSION}.*" -o -name "*${commit}*" \) -delete || true
 
 function build_test_runner {
     local target=""
diff --git a/test/scripts/build-runner-image.sh b/test/scripts/build-runner-image.sh
index 1cb5e6bb263a..6881e0c7f924 100755
--- a/test/scripts/build-runner-image.sh
+++ b/test/scripts/build-runner-image.sh
@@ -38,10 +38,11 @@ case $TARGET in
             "${SCRIPT_DIR}/../target/$TARGET/release/test-runner" \
             "${PACKAGES_DIR}/"app-e2e-* \
             "${TEST_RUNNER_IMAGE_PATH}:/"
-        e2cp \
-            "${PACKAGES_DIR}/"*.deb \
-            "${PACKAGES_DIR}/"*.rpm \
-            "${SCRIPT_DIR}/../openvpn.ca.crt" \
+        e2cp "${PACKAGES_DIR}/"*.deb \
+            "${TEST_RUNNER_IMAGE_PATH}:/" || true
+        e2cp "${PACKAGES_DIR}/"*.rpm \
+            "${TEST_RUNNER_IMAGE_PATH}:/" || true
+        e2cp "${SCRIPT_DIR}/../openvpn.ca.crt" \
             "${TEST_RUNNER_IMAGE_PATH}:/"
         ;;