diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f72641e03..aee628950e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -647,15 +647,16 @@ add_test(NAME conditionalThreads COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAK
     -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref14.txt
     -P ${CMAKE_SOURCE_DIR}/runTest.cmake )
 
-add_test(NAME linkingIndirectNoversion COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX86} 
-    -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests/test15 -D TEST_OUTPUT=tmpfile.txt 
-    -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref15.txt
-    -P ${CMAKE_SOURCE_DIR}/runTest.cmake )
-
-add_test(NAME linkingIndirectVersion COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX86} 
-    -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests/test16 -D TEST_OUTPUT=tmpfile.txt 
-    -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref16.txt
-    -P ${CMAKE_SOURCE_DIR}/runTest.cmake )
+# WIP
+#add_test(NAME linkingIndirectNoversion COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX86} 
+#    -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests/test15 -D TEST_OUTPUT=tmpfile.txt 
+#    -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref15.txt
+#    -P ${CMAKE_SOURCE_DIR}/runTest.cmake )
+#
+#add_test(NAME linkingIndirectVersion COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX86} 
+#    -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests/test16 -D TEST_OUTPUT=tmpfile.txt 
+#    -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref16.txt
+#    -P ${CMAKE_SOURCE_DIR}/runTest.cmake )
 
 file(GLOB extension_tests "${CMAKE_SOURCE_DIR}/tests/extensions/*.c")
 foreach(file ${extension_tests})
diff --git a/tests/test15 b/tests/test15
index b54028ac1c..386f69d9fb 100755
Binary files a/tests/test15 and b/tests/test15 differ
diff --git a/tests/test15.c b/tests/test15.c
index 0788c0401d..34f91401bf 100644
--- a/tests/test15.c
+++ b/tests/test15.c
@@ -2,8 +2,8 @@
  * Compile with (on x86_64 archs):
  *  gcc -m32 -DV1 -shared -o test15_v1.so test15.c
  *  gcc -m32 -DV2 -shared -o test15_v2.so test15.c -Wl,--version-script=test15_version.map
- *  gcc -m32 -shared -o test15_dv1.so test15.c -L. -Wl,-rpath=. -l:test15_v1.so
- *  gcc -m32 -DMAIN -o test15 test15.c -L. -Wl,-rpath=. -l:test15_dv1.so -l:test15_v2.so
+ *  gcc -m32 -shared -o test15_dv1.so test15.c -L. -Wl,-z,origin,-rpath='$ORIGIN' -l:test15_v1.so
+ *  gcc -m32 -DMAIN -o test15 test15.c -L. -Wl,-z,origin,-rpath='$ORIGIN' -l:test15_dv1.so -l:test15_v2.so
  */
 
 #if defined(MAIN)
diff --git a/tests/test15_dv1.so b/tests/test15_dv1.so
index 4f252d4af2..2925ce8f88 100755
Binary files a/tests/test15_dv1.so and b/tests/test15_dv1.so differ
diff --git a/tests/test16 b/tests/test16
index 154b000339..1ff6e436e3 100755
Binary files a/tests/test16 and b/tests/test16 differ
diff --git a/tests/test16.c b/tests/test16.c
index 59b255c30c..6dc4023030 100644
--- a/tests/test16.c
+++ b/tests/test16.c
@@ -2,8 +2,8 @@
  * Compile with (on x86_64 archs):
  *  gcc -m32 -DV1 -shared -o test16_v1.so test16.c -Wl,--version-script=test16_version.map
  *  gcc -m32 -DV2 -shared -o test16_v2.so test16.c
- *  gcc -m32 -shared -o test16_dv1.so test16.c -L. -Wl,-rpath=. -l:test16_v1.so
- *  gcc -m32 -DMAIN -o test16 test16.c -L. -Wl,-rpath=. -l:test16_dv1.so -l:test16_v2.so
+ *  gcc -m32 -shared -o test16_dv1.so test16.c -L. -Wl,-z,origin,-rpath='$ORIGIN' -l:test16_v1.so
+ *  gcc -m32 -DMAIN -o test16 test16.c -L. -Wl,-z,origin,-rpath='$ORIGIN' -l:test16_dv1.so -l:test16_v2.so
  */
 
 #if defined(MAIN)
diff --git a/tests/test16_dv1.so b/tests/test16_dv1.so
index c89bc2e767..2dbb5dd681 100755
Binary files a/tests/test16_dv1.so and b/tests/test16_dv1.so differ