4 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 15e34720a..c992c972d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -859,6 +859,7 @@ endif
 
 resolv_tests_SOURCES = \
     src/tests/resolv-tests.c \
+    src/tests/common.c \
     $(SSSD_RESOLV_TESTS_OBJ)
 resolv_tests_CFLAGS = \
     $(AM_CFLAGS) \
@@ -946,6 +947,7 @@ ad_ldap_opt_tests_LDADD = \
 
 simple_access_tests_SOURCES = \
     src/tests/simple_access-tests.c \
+    src/tests/common.c \
     src/providers/simple/simple_access.c
 simple_access_tests_CFLAGS = \
     $(AM_CFLAGS) \
@@ -967,7 +969,8 @@ util_tests_LDADD = \
     libsss_test_common.la
 
 debug_tests_SOURCES = \
-    src/tests/debug-tests.c
+    src/tests/debug-tests.c \
+    src/tests/common.c
 debug_tests_CFLAGS = \
     $(AM_CFLAGS) \
     $(CHECK_CFLAGS)
diff --git a/src/tests/debug-tests.c b/src/tests/debug-tests.c
index 40dd2e98b..a751d836c 100644
--- a/src/tests/debug-tests.c
+++ b/src/tests/debug-tests.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <string.h>
 #include "util/util.h"
+#include "tests/common.h"
 
 #define DEBUG_TEST_ERROR    -1
 #define DEBUG_TEST_NOK      1
@@ -1022,6 +1023,8 @@ int main(int argc, const char *argv[])
 {
     int number_failed;
 
+    tests_set_cwd();
+
     Suite *s = debug_suite();
     SRunner *sr = srunner_create(s);
 
diff --git a/src/tests/resolv-tests.c b/src/tests/resolv-tests.c
index b56dc9e87..ad89aaf6d 100644
--- a/src/tests/resolv-tests.c
+++ b/src/tests/resolv-tests.c
@@ -33,6 +33,7 @@
 
 #include "tests/common.h"
 #include "util/util.h"
+#include "tests/common.h"
 
 /* Interface under test */
 #include "resolv/async_resolv.h"
@@ -862,6 +863,8 @@ int main(int argc, const char *argv[])
                "option to run the full suite of tests\n");
     }
 
+    tests_set_cwd();
+
     resolv_suite = create_resolv_suite();
     sr = srunner_create(resolv_suite);
     /* If CK_VERBOSITY is set, use that, otherwise it defaults to CK_NORMAL */
diff --git a/src/tests/simple_access-tests.c b/src/tests/simple_access-tests.c
index 4f041d400..c61814eb5 100644
--- a/src/tests/simple_access-tests.c
+++ b/src/tests/simple_access-tests.c
@@ -28,6 +28,7 @@
 
 #include "confdb/confdb.h"
 #include "providers/simple/simple_access.h"
+#include "tests/common.h"
 
 const char *ulist_1[] = {"u1", "u2", NULL};
 
@@ -197,6 +198,8 @@ int main(int argc, const char *argv[])
 
     CONVERT_AND_SET_DEBUG_LEVEL(debug_level);
 
+    tests_set_cwd();
+
     Suite *s = access_simple_suite();
     SRunner *sr = srunner_create(s);
     srunner_run_all(sr, CK_ENV);