diff --git a/src/tests/servers/app/copy_bits/Jamfile b/src/tests/servers/app/copy_bits/Jamfile
index 5aed55b870..3490f83f8a 100644
--- a/src/tests/servers/app/copy_bits/Jamfile
+++ b/src/tests/servers/app/copy_bits/Jamfile
@@ -5,10 +5,8 @@ UseHeaders [ FDirName os interface ] ;
 
 SimpleTest CopyBits :
 	main.cpp
-# for running natively under R5:
-#	: be ;
 # for running in the Haiku app_server under R5:
-	: libopenbeos.so ;
-# for running on Haiku:
+	: <boot!home!config!lib>libopenbeos.so ;
+# for running natively under R5 or Haiku:
 #	: libbe.so ;
 
diff --git a/src/tests/servers/app/scrolling/Jamfile b/src/tests/servers/app/scrolling/Jamfile
index b1457ce685..841869c9bd 100644
--- a/src/tests/servers/app/scrolling/Jamfile
+++ b/src/tests/servers/app/scrolling/Jamfile
@@ -5,10 +5,8 @@ UseHeaders [ FDirName os interface ] ;
 
 SimpleTest Scrolling :
 	main.cpp
-# for running natively under R5:
-#	: be ;
 # for running in the Haiku app_server under R5:
-	: libopenbeos.so ;
-# for running on Haiku:
+	: <boot!home!config!lib>libopenbeos.so ;
+# for running natively under R5 or Haiku:
 #	: libbe.so ;
 
diff --git a/src/tests/servers/app/textview/Jamfile b/src/tests/servers/app/textview/Jamfile
index c9c2db7af7..edb5d5f3bd 100644
--- a/src/tests/servers/app/textview/Jamfile
+++ b/src/tests/servers/app/textview/Jamfile
@@ -5,10 +5,8 @@ UseHeaders [ FDirName os interface ] ;
 
 SimpleTest TextView :
 	main.cpp
-# for running natively under R5:
-#	: be ;
 # for running in the Haiku app_server under R5:
-	: libopenbeos.so ;
-# for running on Haiku:
+	: <boot!home!config!lib>libopenbeos.so ;
+# for running natively under R5 or Haiku:
 #	: libbe.so ;
 
diff --git a/src/tests/servers/app/textview/run b/src/tests/servers/app/textview/run
index 30fbbe4120..b8867f43a4 100755
--- a/src/tests/servers/app/textview/run
+++ b/src/tests/servers/app/textview/run
@@ -2,4 +2,6 @@
 
 ../../../../../distro/x86.R1/beos/system/servers/app_server &
 sleep 1s
-../../../../../tests/servers/app/textview/TextView
+../../../../../distro/x86.R1/beos/system/servers/obos_registrar &
+sleep 1s
+../../../../../tests/servers/app/windows/Window
diff --git a/src/tests/servers/app/windows/Jamfile b/src/tests/servers/app/windows/Jamfile
index 45478f6087..e91661e0bb 100644
--- a/src/tests/servers/app/windows/Jamfile
+++ b/src/tests/servers/app/windows/Jamfile
@@ -6,7 +6,7 @@ UseHeaders [ FDirName os interface ] ;
 SimpleTest Window :
 	main.cpp
 # for running in the Haiku app_server under R5:
-	: libopenbeos.so ;
+	: <boot!home!config!lib>libopenbeos.so ;
 # for running natively under R5 or Haiku:
 #	: libbe.so ;