diff --git a/repos/base-linux/run/lx_fs.run b/repos/base-linux/run/lx_fs.run
index b681e4bc28..36a156c783 100644
--- a/repos/base-linux/run/lx_fs.run
+++ b/repos/base-linux/run/lx_fs.run
@@ -38,7 +38,7 @@ install_config {
 		<config> <policy label_prefix="test-libc_vfs" root="/libc_vfs" writeable="yes" /> </config>
 	</start>
 	<start name="test-libc_vfs">
-		<resource name="RAM" quantum="2M"/>
+		<resource name="RAM" quantum="4M"/>
 		<config>
 			<vfs>
 				<fs />
diff --git a/repos/dde_rump/run/rump_cgd_ext2.run b/repos/dde_rump/run/rump_cgd_ext2.run
index 4531da3244..cecc3dfd3e 100644
--- a/repos/dde_rump/run/rump_cgd_ext2.run
+++ b/repos/dde_rump/run/rump_cgd_ext2.run
@@ -98,7 +98,7 @@ append config {
 		</route>
 	</start>
 	<start name="test-libc_vfs">
-		<resource name="RAM" quantum="2M"/>
+		<resource name="RAM" quantum="4M"/>
 		<config>
 			<libc stdout="/dev/log">
 				<vfs>
diff --git a/repos/libports/run/libc_vfs.run b/repos/libports/run/libc_vfs.run
index 9d2baca9cc..e2f1987e60 100644
--- a/repos/libports/run/libc_vfs.run
+++ b/repos/libports/run/libc_vfs.run
@@ -35,7 +35,7 @@ set config {
 		<config> <default-policy root="/" writeable="yes"/> </config>
 	</start>
 	<start name="test-libc_vfs">
-		<resource name="RAM" quantum="2M"/>
+		<resource name="RAM" quantum="4M"/>
 		<config>
 			<iterations value="1"/>}
 append_if [have_include "power_on/qemu"] config {
@@ -59,7 +59,7 @@ install_config $config
 
 build_boot_image {
 	core init
-	ld.lib.so libc.lib.so libm.lib.so
+	ld.lib.so libc.lib.so
 	ram_fs test-libc_vfs
 }
 
diff --git a/repos/libports/run/libc_vfs_block.run b/repos/libports/run/libc_vfs_block.run
index ba6a3988ea..f4f367e754 100644
--- a/repos/libports/run/libc_vfs_block.run
+++ b/repos/libports/run/libc_vfs_block.run
@@ -35,7 +35,7 @@ set config {
 		<config size="16K" block_size="4096"/>
 	</start>
 	<start name="test-libc_vfs_block">
-		<resource name="RAM" quantum="2M"/>
+		<resource name="RAM" quantum="4M"/>
 		<config>
 			<vfs> <dir name="dev"> <block/> </dir> </vfs>
 			<libc/>
@@ -74,7 +74,7 @@ install_config $config
 
 build_boot_image {
 	core init
-	ld.lib.so libc.lib.so libm.lib.so posix.lib.so
+	ld.lib.so libc.lib.so
 	ram_blk test-libc_vfs_block
 }
 
diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc
index 2f1eb34c60..8111a9d9ee 100644
--- a/repos/libports/run/libc_vfs_filesystem_test.inc
+++ b/repos/libports/run/libc_vfs_filesystem_test.inc
@@ -160,8 +160,7 @@ install_config $config
 
 # generic modules
 append boot_modules {
-	libc.lib.so libm.lib.so posix.lib.so
-	test-libc_vfs
+	libc.lib.so test-libc_vfs
 }
 
 lappend boot_modules {*}$test_boot_modules
diff --git a/repos/libports/run/libc_vfs_fs.run b/repos/libports/run/libc_vfs_fs.run
index 64bf384a59..5c13597605 100644
--- a/repos/libports/run/libc_vfs_fs.run
+++ b/repos/libports/run/libc_vfs_fs.run
@@ -38,7 +38,7 @@ set config {
 		</config>
 	</start>
 	<start name="test-libc_vfs">
-		<resource name="RAM" quantum="2M"/>
+		<resource name="RAM" quantum="4M"/>
 		<config>
 			<iterations value="1"/>}
 append_if [have_include "power_on/qemu"] config {
@@ -62,7 +62,7 @@ install_config $config
 
 build_boot_image {
 	core init vfs
-	ld.lib.so libc.lib.so libm.lib.so posix.lib.so
+	ld.lib.so libc.lib.so
 	test-libc_vfs
 }
 
@@ -70,7 +70,7 @@ build_boot_image {
 # Execute test case
 #
 
-append qemu_args "  -nographic "
+append qemu_args " -nographic "
 run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
 
 # vi: set ft=tcl :
diff --git a/repos/libports/run/libc_vfs_fs_test.inc b/repos/libports/run/libc_vfs_fs_test.inc
index aa8d462588..36c00f7a26 100644
--- a/repos/libports/run/libc_vfs_fs_test.inc
+++ b/repos/libports/run/libc_vfs_fs_test.inc
@@ -77,7 +77,7 @@ append config {
 		</config>
 	</start>
 	<start name="test-libc_vfs">
-		<resource name="RAM" quantum="2M"/>
+		<resource name="RAM" quantum="4M"/>
 		<config>
 			<libc stdout="/dev/log"/>
 			<vfs>
diff --git a/repos/libports/run/libc_vfs_ram.run b/repos/libports/run/libc_vfs_ram.run
index 4610fa6c81..6411fd5e90 100644
--- a/repos/libports/run/libc_vfs_ram.run
+++ b/repos/libports/run/libc_vfs_ram.run
@@ -56,7 +56,7 @@ install_config $config
 
 build_boot_image {
 	core init
-	ld.lib.so libc.lib.so libm.lib.so
+	ld.lib.so libc.lib.so
 	test-libc_vfs
 }
 
diff --git a/repos/libports/run/python.run b/repos/libports/run/python.run
index 8809bd49e7..f07816cc32 100644
--- a/repos/libports/run/python.run
+++ b/repos/libports/run/python.run
@@ -36,7 +36,7 @@ set config {
 	</default-route>
 	<default caps="100"/>
 	<start name="test-python">
-		<resource name="RAM" quantum="3M"/>
+		<resource name="RAM" quantum="4M"/>
 		<config>
 			<vfs>
 				<dir name="dev"> <log/> </dir>
diff --git a/repos/os/run/fs_rom_update.run b/repos/os/run/fs_rom_update.run
index c5ff3cd115..ca018c6185 100644
--- a/repos/os/run/fs_rom_update.run
+++ b/repos/os/run/fs_rom_update.run
@@ -110,12 +110,11 @@ set boot_modules {
 	ram_fs
 	rom_logger
 	rom_to_file
-	test-libc_vfs
 	timer
 }
 
 build_boot_image $boot_modules
 
-append qemu_args "  -nographic"
+append qemu_args " -nographic "
 
-run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
+run_genode_until forever