diff --git a/run/gmock.run b/run/gmock.run
index 48e7ce7..ef8ca42 100644
--- a/run/gmock.run
+++ b/run/gmock.run
@@ -1,3 +1,8 @@
+if {[have_spec linux]} {
+	puts "Platform is unsupported. (rtc driver support)"
+	exit 0
+}
+
 #
 # Build
 #
@@ -6,7 +11,7 @@ set build_components {
 	core init
 	timer
 	drivers/rtc
-	server/ram_fs
+	server/vfs
 	test/gmock
 }
 
@@ -47,11 +52,15 @@ install_config {
 
 	<start name="ram_fs">
 		<resource name="RAM" quantum="4M"/>
+		<binary name="vfs"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy label="gmock -> " root="/" writeable="yes" /> </config>
+		<config>
+			<vfs> <ram/> </vfs>
+			<policy label="gmock -> " root="/" writeable="yes" />
+		</config>
 	</start>
 
-	<start name="gmock">
+	<start name="gmock" caps="200">
 		<resource name="RAM" quantum="4M"/>
 		<config>
 			<vfs>
@@ -71,10 +80,10 @@ install_config {
 
 build_boot_image {
 	core init ld.lib.so
-	timer ram_fs
+	timer vfs
 	libc.lib.so vfs.lib.so libm.lib.so posix.lib.so stdcxx.lib.so
 	rtc_drv
-	gmock.lib.so
+	gmock.lib.so gtest.lib.so
 	gmock
 }
 
diff --git a/run/gtest.run b/run/gtest.run
index e7667e0..c823fac 100644
--- a/run/gtest.run
+++ b/run/gtest.run
@@ -5,7 +5,7 @@
 set build_components {
 	core init
 	timer
-	server/ram_fs
+	server/vfs
 	test/gtest
 }
 
@@ -40,9 +40,13 @@ install_config {
 	</start>
 
 	<start name="ram_fs">
+		<binary name="vfs"/>
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy label="gtest -> " root="/" writeable="yes" /> </config>
+		<config>
+			<vfs> <ram/> </vfs>
+			<policy label="gtest -> " root="/" writeable="yes" />
+		</config>
 	</start>
 
 	<start name="gtest">
@@ -63,7 +67,7 @@ install_config {
 
 build_boot_image {
 	core init ld.lib.so
-	timer ram_fs
+	timer vfs
 	libc.lib.so vfs.lib.so libm.lib.so posix.lib.so stdcxx.lib.so
 	gtest.lib.so gtest
 }
diff --git a/run/protobuf.run b/run/protobuf.run
index e1b1225..ac57c05 100644
--- a/run/protobuf.run
+++ b/run/protobuf.run
@@ -1,11 +1,11 @@
 create_boot_directory
 
-import_from_depot [depot_user]/src/[base_src]
-import_from_depot [depot_user]/src/init
-import_from_depot [depot_user]/src/ram_fs
-import_from_depot [depot_user]/src/sequence
-import_from_depot [depot_user]/src/vfs
-import_from_depot [depot_user]/src/zlib
+import_from_depot [depot_user]/src/[base_src] \
+                  [depot_user]/src/init \
+                  [depot_user]/src/sequence \
+                  [depot_user]/src/vfs \
+                  [depot_user]/src/vfs_import \
+                  [depot_user]/src/zlib
 
 
 set build_components {
@@ -35,25 +35,29 @@ set config {
 
 	<start name="ram_fs">
 		<resource name="RAM" quantum="4M" />
+		<binary name="vfs"/>
 		<provides> <service name="File_system"/> </provides>
 		<config>
-			<content>
-				<inline name="input.txt">1
+			<vfs>
+				<ram/>
+				<import>
+					<inline name="input.txt">1
 Muster Hans
 hans@muster.com
 123456789012345
 home
 
-				</inline>
-				<inline name="input2.txt">2
+					</inline>
+					<inline name="input2.txt">2
 Hans Muster
 muster@hans.com
 999999999999999
 mobile
 
-				</inline>
-				<inline name="addresses.bin"></inline>
-			</content>
+					</inline>
+					<inline name="addresses.bin"></inline>
+				</import>
+			</vfs>
 			<default-policy root="/" writeable="yes"/>
 		</config>
 	</start>