tests/src/libsystem.c   | 9 ++++++---

 tests/src/test-runner.c | 5 +++++

 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c

index 1c68dc10..5dca3fad 100644

--- a/tests/src/libsystem.c

+++ b/tests/src/libsystem.c

@@ -351,6 +351,7 @@ __xstat (int version, const char *path, struct stat *buf)

     return ___xstat (version, new_path, buf);

 }

+int __xstat64 (int version, const char *path, struct stat64 *buf);

 int

 __xstat64 (int version, const char *path, struct stat64 *buf)

 {

@@ -360,6 +361,7 @@ __xstat64 (int version, const char *path, struct stat64 *buf)

     return ___xstat64 (version, new_path, buf);

 }

+int __fxstatat(int ver, int dirfd, const char *pathname, struct stat *buf, int flags);

 int

 __fxstatat(int ver, int dirfd, const char *pathname, struct stat *buf, int flags)

 {

@@ -369,6 +371,7 @@ __fxstatat(int ver, int dirfd, const char *pathname, struct stat *buf, int flags

     return ___fxstatat (ver, dirfd, new_path, buf, flags);

 }

+int __fxstatat64(int ver, int dirfd, const char *pathname, struct stat64 *buf, int flags);

 int

 __fxstatat64(int ver, int dirfd, const char *pathname, struct stat64 *buf, int flags)

 {

@@ -1160,7 +1163,7 @@ pam_putenv (pam_handle_t *pamh, const char *name_value)

 }

 const char *

-pam_getenv (pam_handle_t *pamh, const char *name)

+pam_getenv (const pam_handle_t *pamh, const char *name)

 {

     for (int i = 0; pamh->envlist[i]; i++)

     {

@@ -1173,7 +1176,7 @@ pam_getenv (pam_handle_t *pamh, const char *name)

 }

 char **

-pam_getenvlist (pam_handle_t *pamh)

+pam_getenvlist (const pam_handle_t *pamh)

 {

     return pamh->envlist;

 }

@@ -1466,7 +1469,7 @@ pam_end (pam_handle_t *pamh, int pam_status)

 }

 const char *

-pam_strerror (pam_handle_t *pamh, int errnum)

+pam_strerror (const pam_handle_t *pamh, int errnum)

 {

     if (pamh == NULL)

         return NULL;

diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c

index 1b961961..45b13f3e 100644

--- a/tests/src/test-runner.c

+++ b/tests/src/test-runner.c

@@ -2713,6 +2713,11 @@ main (int argc, char **argv)

     g_autofree gchar *group_path = g_build_filename (temp_dir, "etc", "group", NULL);

     g_file_set_contents (group_path, group_data->str, -1, NULL);

+    g_autofree gchar *sysconfig_path = g_build_filename (temp_dir, "etc", "sysconfig", NULL);

+    g_mkdir_with_parents (sysconfig_path, 0755);

+    g_autofree gchar *alt_i18n_path = g_build_filename (temp_dir, "etc", "sysconfig", "i18n", NULL);

+    g_file_set_contents (alt_i18n_path, "", -1, NULL);

+

     if (g_key_file_has_key (config, "test-runner-config", "timeout", NULL))

         status_timeout_ms = g_key_file_get_integer (config, "test-runner-config", "timeout", NULL) * 1000;