diff --git a/repos/libports/run/libc_vfs_exfat_fuse_fs.run b/repos/libports/run/libc_vfs_exfat_fuse_fs.run
new file mode 100644
index 0000000000..789d04295d
--- /dev/null
+++ b/repos/libports/run/libc_vfs_exfat_fuse_fs.run
@@ -0,0 +1,7 @@
+set build_component server/fuse_fs/exfat
+set binary          exfat_fuse_fs
+set mkfs_cmd        mkfs.exfat
+set mkfs_opts       ""
+set vfs_dev_blkdev  {<block name="blkdev"/>}
+
+source ${genode_dir}/repos/libports/run/libc_vfs_fs_test.inc
diff --git a/repos/libports/run/libc_vfs_ext2_fuse_fs.run b/repos/libports/run/libc_vfs_ext2_fuse_fs.run
new file mode 100644
index 0000000000..eb61360fc8
--- /dev/null
+++ b/repos/libports/run/libc_vfs_ext2_fuse_fs.run
@@ -0,0 +1,7 @@
+set build_component server/fuse_fs/ext2
+set binary          ext2_fuse_fs
+set mkfs_cmd        mkfs.ext2
+set mkfs_opts       "-F"
+set vfs_dev_blkdev  {<block name="blkdev"/>}
+
+source ${genode_dir}/repos/libports/run/libc_vfs_fs_test.inc
diff --git a/repos/libports/run/libc_vfs_ffat_fs.run b/repos/libports/run/libc_vfs_ffat_fs.run
new file mode 100644
index 0000000000..600fb711a6
--- /dev/null
+++ b/repos/libports/run/libc_vfs_ffat_fs.run
@@ -0,0 +1,7 @@
+set build_component server/ffat_fs
+set binary          ffat_fs
+set mkfs_cmd        mkfs.vfat
+set mkfs_opts       "-F32"
+set vfs_dev_blkdev  ""
+
+source ${genode_dir}/repos/libports/run/libc_vfs_fs_test.inc
diff --git a/repos/libports/run/libc_ffat_fs.run b/repos/libports/run/libc_vfs_fs_test.inc
similarity index 83%
rename from repos/libports/run/libc_ffat_fs.run
rename to repos/libports/run/libc_vfs_fs_test.inc
index 77ea9d071c..aa8d462588 100644
--- a/repos/libports/run/libc_ffat_fs.run
+++ b/repos/libports/run/libc_vfs_fs_test.inc
@@ -1,13 +1,13 @@
 #
-# \brief  Test for using the libc_vfs plugin with the FFAT file system
+# \brief  Test for using the libc_vfs plugin with a file system server
 # \author Christian Prochaska
-# \date   2012-07-03
+# \date   2017-06-13
 #
 
 set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec pl180]]
 set use_ahci_drv   [expr [have_spec x86] && ![have_spec linux]]
 set use_ram_blk    [have_spec linux]
-set mkfs [check_installed mkfs.vfat]
+set mkfs [check_installed $mkfs_cmd]
 
 if {[have_spec odroid_xu]} {
         puts "Run script does not support this platform"; exit }
@@ -19,10 +19,11 @@ if {[have_spec odroid_xu]} {
 set build_components {
 	core init
 	drivers/timer
-	server/ffat_fs
 	test/libc_vfs
 }
 
+lappend build_components $build_component
+
 lappend_if $use_ahci_drv    build_components drivers/ahci
 lappend_if $use_sd_card_drv build_components drivers/sd_card
 lappend_if $use_ram_blk     build_components server/ram_blk
@@ -57,10 +58,23 @@ set config {
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Timer"/> </provides>
 	</start>
-	<start name="ffat_fs">
+	<start name="fs">}
+append config "
+		<binary name=\"$binary\"/>"
+append config {
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <default-policy root="/" writeable="yes" /> </config>
+		<config>
+			<default-policy root="/" writeable="yes" />
+			<vfs>
+				<dir name="dev">
+					<log/>}
+append config "     $vfs_dev_blkdev"
+append config {
+				</dir>
+			</vfs>
+			<libc stdout="/dev/log" stderr="/dev/log" />
+		</config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="2M"/>
@@ -80,7 +94,7 @@ append_if $use_ahci_drv config {
 		<resource name="RAM" quantum="2M"/>
 		<provides> <service name="Block"/> </provides>
 		<config>
-			<policy label_prefix="ffat_fs" device="0" />
+			<policy label_prefix="fs" device="0" />
 		</config>
 	</start>
 }
@@ -111,11 +125,13 @@ install_config $config
 
 # generic modules
 set boot_modules {
-	core init timer ffat_fs
+	core init timer
 	ld.lib.so libc.lib.so libm.lib.so posix.lib.so
 	test-libc_vfs
 }
 
+lappend boot_modules $binary
+
 lappend_if $use_ahci_drv     boot_modules ahci_drv
 lappend_if $use_sd_card_drv  boot_modules sd_card_drv
 lappend_if $use_ram_blk      boot_modules ram_blk
@@ -134,8 +150,8 @@ set cmd "dd if=/dev/zero of=$disk_image bs=1024 count=65536"
 puts "creating disk image: $cmd"
 catch { exec sh -c $cmd }
 
-set cmd "$mkfs -F32 $disk_image"
-puts "formating disk image with vfat file system: $cmd"
+set cmd "$mkfs $mkfs_opts $disk_image"
+puts "formating disk image: $cmd"
 catch { exec sh -c $cmd }
 
 #
diff --git a/repos/libports/run/libc_vfs_ntfs-3g_fuse_fs.run b/repos/libports/run/libc_vfs_ntfs-3g_fuse_fs.run
new file mode 100644
index 0000000000..b2268e3379
--- /dev/null
+++ b/repos/libports/run/libc_vfs_ntfs-3g_fuse_fs.run
@@ -0,0 +1,7 @@
+set build_component server/fuse_fs/ntfs-3g
+set binary          ntfs-3g_fuse_fs
+set mkfs_cmd        mkfs.ntfs
+set mkfs_opts       ""
+set vfs_dev_blkdev  {<block name="blkdev"/>}
+
+source ${genode_dir}/repos/libports/run/libc_vfs_fs_test.inc