diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_next1 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_next1
index 7d7ef305e7..66f24cf042 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_next1
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_next1
@@ -93,7 +93,6 @@ main()
 	void* liba;
 	void* libe;
 	void* self;
-//	int (*a)();
 
 	libe = dlopen("./libe.so", RTLD_NOW | RTLD_GLOBAL);
 	if (libe == NULL) {
@@ -107,20 +106,12 @@ main()
 		exit(117);
 	}
 
-/*
-	a = (int (*)())dlsym(libe, "a");
-	if (a == NULL) {
-		fprintf(stderr, "Error getting symbol a: %s\n", dlerror());
-		exit(116);
-	}
-*/
-
 	return a();
 }
 EOI
 
 # build
-gcc -o program program.c -D_GNU_SOURCE $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c -D_GNU_SOURCE $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 31
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order1 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order1
index d506ac59c0..19bf29e71a 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order1
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order1
@@ -83,7 +83,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order2 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order2
index ae801422b7..2ef82c66c3 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order2
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order2
@@ -83,7 +83,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 2
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order3 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order3
index 359ccf9e70..1d10720157 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order3
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order3
@@ -79,7 +79,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 2
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order4 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order4
index 3427f54270..e23e370cdc 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order4
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order4
@@ -83,7 +83,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic1 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic1
index 9abb56491b..a903684a3a 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic1
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic1
@@ -5,8 +5,7 @@
 # dlopen():
 # liba.so
 #
-# Expected: Undefined symbol in liba.so might resolve to symbol in program, but
-# the program image is ignored, so dlopen() on liba.so fails.
+# Expected: Undefined symbol in liba.so resolve to symbol in program.
 
 
 . test_setup
@@ -54,7 +53,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
-test_run_ok ./program 117
+test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic2 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic2
index b7a6ffa49c..95ec6ff1ae 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic2
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic2
@@ -60,7 +60,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c ./libb.so $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c ./libb.so $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic3 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic3
index 6898ee9f53..9e3c738c56 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic3
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic3
@@ -70,7 +70,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
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 b2801234d0..99f908f376 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1
@@ -6,8 +6,8 @@
 # libb.so
 # liba.so
 #
-# Expected: Undefined symbol in liba.so resolves to symbol in libb.so, not
-# to symbol in program, since program image is ignored.
+# Expected: Undefined symbol in liba.so resolves to symbol in program, not
+# to symbol in libb.so.
 
 
 . test_setup
@@ -70,8 +70,8 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
-test_run_ok ./program 2
+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 88c444982a..16b10e9f8e 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
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 2
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order3 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order3
index 8a6d0779ed..fc6c118d7a 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order3
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order3
@@ -77,7 +77,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # 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 e5c02395e9..8e3af54fe7 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
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 2
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order5 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order5
index 02b5107fd6..52367c2c71 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order5
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order5
@@ -97,7 +97,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 2
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order6 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order6
index c7b57a4170..afbb9eb030 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order6
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order6
@@ -105,7 +105,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order7 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order7
index adac3e6f96..72a6d39ba3 100755
--- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order7
+++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order7
@@ -77,7 +77,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c $libdl -Xlinker -rpath -Xlinker .
+gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/load_lookup_next1 b/src/tests/system/runtime_loader/test_suite/load_lookup_next1
index 2c7e632f1d..1a053f434e 100755
--- a/src/tests/system/runtime_loader/test_suite/load_lookup_next1
+++ b/src/tests/system/runtime_loader/test_suite/load_lookup_next1
@@ -73,8 +73,8 @@ main()
 EOI
 
 # build
-gcc -o program program.c -D_GNU_SOURCE ./liba.so $libdl -Xlinker -rpath \
-	-Xlinker .
+gcc -o program program.c -D_GNU_SOURCE ./liba.so $libdl \
+	-Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 15
diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_basic1 b/src/tests/system/runtime_loader/test_suite/load_resolve_basic1
index fce8f9c663..2644e26f9b 100755
--- a/src/tests/system/runtime_loader/test_suite/load_resolve_basic1
+++ b/src/tests/system/runtime_loader/test_suite/load_resolve_basic1
@@ -37,7 +37,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c ./liba.so
+gcc -o program program.c ./liba.so -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_order1 b/src/tests/system/runtime_loader/test_suite/load_resolve_order1
index 83bce0e92a..f739e8916a 100755
--- a/src/tests/system/runtime_loader/test_suite/load_resolve_order1
+++ b/src/tests/system/runtime_loader/test_suite/load_resolve_order1
@@ -50,7 +50,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c ./liba.so ./libb.so -Xlinker -rpath -Xlinker .
+gcc -o program program.c ./liba.so ./libb.so -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_order2 b/src/tests/system/runtime_loader/test_suite/load_resolve_order2
index cc43400a81..e0f9409156 100755
--- a/src/tests/system/runtime_loader/test_suite/load_resolve_order2
+++ b/src/tests/system/runtime_loader/test_suite/load_resolve_order2
@@ -50,7 +50,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c ./libb.so ./liba.so -Xlinker -rpath -Xlinker .
+gcc -o program program.c ./libb.so ./liba.so -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_order3 b/src/tests/system/runtime_loader/test_suite/load_resolve_order3
index 18d73cb345..cb38223a1d 100755
--- a/src/tests/system/runtime_loader/test_suite/load_resolve_order3
+++ b/src/tests/system/runtime_loader/test_suite/load_resolve_order3
@@ -51,7 +51,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c ./liba.so ./libb.so -Xlinker -rpath -Xlinker .
+gcc -o program program.c ./liba.so ./libb.so -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1
diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_order4 b/src/tests/system/runtime_loader/test_suite/load_resolve_order4
index 41e5ace78b..5cfddf9bb0 100755
--- a/src/tests/system/runtime_loader/test_suite/load_resolve_order4
+++ b/src/tests/system/runtime_loader/test_suite/load_resolve_order4
@@ -45,7 +45,7 @@ main()
 EOI
 
 # build
-gcc -o program program.c ./libb.so -Xlinker -rpath -Xlinker .
+gcc -o program program.c ./libb.so -Wl,-rpath,.,--export-dynamic
 
 # run
 test_run_ok ./program 1