diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh
index cf30e52..901ac43 100755
--- a/tests/tests-ci.sh
+++ b/tests/tests-ci.sh
@@ -3,11 +3,11 @@
 set -x
 
 source /opt/qt*/bin/qt*-env.sh
-/opt/qt*/bin/qmake CONFIG+=debug linuxdeployqt.pro
+/opt/qt*/bin/qmake CONFIG+=release CONFIG+=force_debug_info linuxdeployqt.pro
 make -j
 
 mkdir -p linuxdeployqt.AppDir/usr/bin/
-cp /usr/local/bin/{appimagetool,mksquashfs,patchelf,zsyncmake} linuxdeployqt.AppDir/usr/bin/
+cp /usr/bin/patchelf /usr/local/bin/{appimagetool,mksquashfs,zsyncmake} linuxdeployqt.AppDir/usr/bin/
 find linuxdeployqt.AppDir/
 export VERSION=continuous
 cp ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/usr/bin/
@@ -31,12 +31,13 @@ ulimit -c unlimited
 ulimit -a -S
 ulimit -a -H
 
-bash -e tests/tests.sh || RESULT=$?
+bash -e tests/tests.sh
 
-if [ $RESULT -ne 0 ]; then
+if [ $? -ne 0 ]; then
   echo "FAILURE: linuxdeployqt CRASHED -- uploading files for debugging to transfer.sh"
   set -v
   [ -e /tmp/coredump ] && curl --upload-file /tmp/coredump https://transfer.sh/coredump
   curl --upload-file linuxdeployqt-*-x86_64.AppImage https://transfer.sh/linuxdeployqt-x86_64.AppImage
+  find -type f -iname 'libQt5Core.so*' -exec curl --upload {} https://transfer.sh/libQt5Core.so \; || true
   exit $RESULT
 fi
diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh
index 68022dd..a75fee5 100755
--- a/tests/tests-environment.sh
+++ b/tests/tests-environment.sh
@@ -5,14 +5,8 @@ set -e
 sudo add-apt-repository --yes ppa:beineri/opt-qt58-trusty
 sudo apt-get update -qq
 
-git clone -o 44b7f95 https://github.com/NixOS/patchelf.git
-cd patchelf
-bash ./bootstrap.sh
-./configure
-make -j2
-sudo make install
-
-cd -
+wget http://ftp.de.debian.org/debian/pool/main/p/patchelf/patchelf_0.8-2_amd64.deb
+sudo dpkg -i patchelf_0.8-2_amd64.deb
 
 cd /tmp/
 wget -c "https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"