@@ -1,6 +1,8 @@
1+diff --git a/tests/libtest.sh b/tests/libtest.sh
2+index 46bcefb3..0134425e 100644
13--- a/tests/libtest.sh
24+++ b/tests/libtest.sh
3−@@ -328,7 +328,7 @@
5+@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then
46 # running installed-tests: assume we know what we're doing
57 _flatpak_bwrap_works=true
68 elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
@@ -9,7 +11,7 @@
911 _flatpak_bwrap_works=false
1012 else
1113 _flatpak_bwrap_works=true
12−@@ -309,12 +309,12 @@
14+@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \
1315 export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
1416 DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
1517
@@ -24,9 +26,11 @@
2426 gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
2527 fusermount -u $XDG_RUNTIME_DIR/doc || :
2628 if test -n "${TEST_SKIP_CLEANUP:-}"; then
29+diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
30+index 0a0a28f1..16fd51fe 100755
2731--- a/tests/make-test-app.sh
2832+++ b/tests/make-test-app.sh
29−@@ -114,13 +114,13 @@ msgid "Hello world"
33+@@ -129,13 +129,13 @@ msgid "Hello world"
3034 msgstr "Hallo Welt"
3135 EOF
3236 mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES
@@ -42,9 +46,11 @@
4246
4347 flatpak build-finish ${DIR}
4448 mkdir -p repos
49+diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
50+index 57899b75..9236996f 100755
4551--- a/tests/make-test-runtime.sh
4652+++ b/tests/make-test-runtime.sh
47−@@ -26,6 +26,7 @@
53+@@ -28,6 +28,7 @@ EOF
4854 PATH="$PATH:/usr/sbin:/sbin"
4955
5056 # Add bash and dependencies
@@ -52,7 +58,7 @@
5258 mkdir -p ${DIR}/usr/bin
5359 mkdir -p ${DIR}/usr/lib
5460 ln -s ../lib ${DIR}/usr/lib64
55−@@ -35,48 +36,27 @@
61+@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then
5662 else
5763 cp `which ldconfig` ${DIR}/usr/bin
5864 fi
@@ -105,21 +111,20 @@
105111-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
106112-# the real en_US locale is often not available, because its in the
107113-# local archive.
114+-mkdir -p ${DIR}/usr/lib/locale/
115+-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
108116+mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store
109117+chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed
110118+find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths
111119+find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets
112−+
113−+# We copy the whole locale archive because we do not have C.UTF8 locale
114− mkdir -p ${DIR}/usr/lib/locale/
115−-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
116−+cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive
117120
118121 if [ x$COLLECTION_ID != x ]; then
119122 collection_args=--collection-id=${COLLECTION_ID}
123+diff --git a/tests/testlibrary.c b/tests/testlibrary.c
124+index f2773dc8..3af9026f 100644
120125--- a/tests/testlibrary.c
121126+++ b/tests/testlibrary.c
122−@@ -584,7 +584,7 @@
127+@@ -1053,7 +1053,7 @@ check_bwrap_support (void)
123128 {
124129 gint exit_code = 0;
125130 char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net",
@@ -128,6 +133,8 @@
128133 g_autofree char *argv_str = g_strjoinv (" ", argv);
129134 g_test_message ("Spawning %s", argv_str);
130135 g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);
136+diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger
137+index 711cfab2..10c220ec 100755
131138--- a/triggers/gtk-icon-cache.trigger
132139+++ b/triggers/gtk-icon-cache.trigger
133140@@ -1,7 +1,7 @@