diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0e76b4b1..aa64dcf4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,9 +20,9 @@ jobs:
           nix build -L .#hydraJobs.tarball
           install -D ./result/tarballs/*.tar.bz2 ./dist/patchelf-$(cat version).tar.bz2
           install -D ./result/tarballs/*.tar.gz ./dist/patchelf-$(cat version).tar.gz
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: patchelf
+          name: patchelf-tarball
           path: dist/*
 
   build_windows:
@@ -37,9 +37,9 @@ jobs:
           nix build -L .#patchelf-win32 .#patchelf-win64
           install -D ./result/bin/patchelf.exe ./dist/patchelf-win32-$(cat version).exe
           install -D ./result-1/bin/patchelf.exe ./dist/patchelf-win64-$(cat version).exe
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: patchelf
+          name: patchelf-windows
           path: dist/*
 
   test_windows:
@@ -48,9 +48,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: patchelf
+          name: patchelf-windows
           path: dist
       - name: Show binaries
         run: dir .\\dist
@@ -83,9 +83,9 @@ jobs:
           fi
           echo "DOCKER_PLATFORM=$platform" >> $GITHUB_ENV
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: patchelf
+          name: patchelf-tarball
           path: dist
       - name: Build binaries
         env:
@@ -120,9 +120,9 @@ jobs:
           ./bin/patchelf --version
           EOF
           docker run --platform "$DOCKER_PLATFORM" -v $(pwd):/gha ${{ matrix.platform }}/debian:unstable-slim sh -ec "cd /gha && sh ./check.sh"
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: patchelf
+          name: patchelf-${{ matrix.platform }}
           path: dist/*
 
   publish:
@@ -131,9 +131,10 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'NixOS/patchelf' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: patchelf
+          pattern: patchelf-*
+          merge-multiple: true
           path: dist
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 61dc342d..14c2ff64 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -81,7 +81,7 @@ export NIX_LDFLAGS=
 simple_SOURCES = simple.c
 # no -fpic for simple.o
 simple_CFLAGS =
-simple_LDFLAGS = -Wl,-z,noexecstack -no-pie
+simple_LDFLAGS = -Wl,-z,noexecstack
 
 simple_pie_SOURCES = simple.c
 simple_pie_CFLAGS = -fPIC -pie
@@ -172,7 +172,7 @@ libmany_syms_so_LDFLAGS = $(LDFLAGS_sharedlib)
 no_rpath_SOURCES = no-rpath.c
 # no -fpic for no-rpath.o
 no_rpath_CFLAGS =
-no_rpath_LDFLAGS = -no-pie
+no_rpath_LDFLAGS =
 
 contiguous_note_sections_SOURCES = contiguous-note-sections.s contiguous-note-sections.ld
 contiguous_note_sections_LDFLAGS = -nostdlib -T $(srcdir)/contiguous-note-sections.ld
diff --git a/tests/short-first-segment.sh b/tests/short-first-segment.sh
index 7eba9f9d..7a11345f 100755
--- a/tests/short-first-segment.sh
+++ b/tests/short-first-segment.sh
@@ -6,13 +6,13 @@ READELF=${READELF:-readelf}
 
 EXEC_NAME="short-first-segment"
 
-if ! gzip --version >/dev/null; then
-    echo "skipping test: gzip not found"
+if test "$(uname -m)" != amd64 || test "$(uname)" != Linux; then
+    echo "skipping test: amd64 Linux required"
     exit 77
 fi
 
-if test "$(uname -m)" != amd64 || test "$(uname)" != Linux; then
-    echo "skipping test: amd64 Linux required"
+if ! command -v gzip >/dev/null; then
+    echo "skipping test: gzip not found"
     exit 77
 fi