diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1
index f57f51fee8..c7722384d8 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1
@@ -70,7 +70,7 @@ main()
 EOI
 
 # build
-compile_lib_dl -o program program.c
+compile_program_dl -o program program.c
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order2 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order2
index b82b5a1f86..3dffb34012 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order2
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order2
@@ -80,7 +80,7 @@ main()
 EOI
 
 # build
-compile_lib_dl -o program program.c
+compile_program_dl -o program program.c
 
 # run
 test_run_ok ./program 2
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order4 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order4
index 862c830592..c905dc5d1e 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order4
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order4
@@ -87,7 +87,7 @@ main()
 EOI
 
 # build
-compile_lib_dl -o program program.c
+compile_program_dl -o program program.c
 
 # run
 test_run_ok ./program 2
diff --git a/src/tests/system/runtime_loader/test_suite/test_setup b/src/tests/system/runtime_loader/test_suite/test_setup
index d8e0d70f94..c46fdacb32 100644
--- a/src/tests/system/runtime_loader/test_suite/test_setup
+++ b/src/tests/system/runtime_loader/test_suite/test_setup
@@ -22,6 +22,12 @@ test_run_ok()
 		exit 1
 	fi
 
+	case $os in
+		FreeBSD|Linux)	export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH;;
+		Haiku)		export LIBRARY_PATH=.:$LIBRARY_PATH;;
+		*)			echo "Unsupported OS: $os"; exit 1;;
+	esac
+
 	# run
 	$1
 	retval=$?
@@ -33,7 +39,7 @@ test_run_ok()
 
 compile_lib()
 {
-	gcc -shared $@ -D_GNU_SOURCE -fPIC
+	gcc -shared -Wl,--no-as-needed -D_GNU_SOURCE -fPIC $@
 }
 
 compile_lib_dl()
@@ -43,7 +49,7 @@ compile_lib_dl()
 
 compile_program()
 {
-	gcc $@ -D_GNU_SOURCE -Wl,-rpath,.,--export-dynamic
+	gcc -Wl,--no-as-needed $@ -D_GNU_SOURCE -Wl,-rpath,.,--export-dynamic
 }
 
 compile_program_dl()