diff --git a/solo5/Tuprules.tup b/solo5/Tuprules.tup
index dd81b6888..98c6edc26 100644
--- a/solo5/Tuprules.tup
+++ b/solo5/Tuprules.tup
@@ -1,2 +1,3 @@
+DEFINES += -fstack-protector-strong
 DEFINES += -Wno-builtin-declaration-mismatch
 INCLUDES += -I$(TUP_CWD)
diff --git a/solo5/solo5.symbols b/solo5/solo5.symbols
index 10c8231d5..37899b6b7 100644
--- a/solo5/solo5.symbols
+++ b/solo5/solo5.symbols
@@ -1,3 +1,5 @@
+__solo5_manifest_note U
+solo5_app_main U
 solo5_abort T
 solo5_block_acquire T
 solo5_block_info T
diff --git a/solo5/test/Tupfile b/solo5/test/Tupfile
index ada174b13..f73ae69b1 100644
--- a/solo5/test/Tupfile
+++ b/solo5/test/Tupfile
@@ -1,16 +1,15 @@
 TARGET_NAME = solo5_tests
 LIBS += solo5 genode-base
+include_rules
 
 PKG_DEPENDS += \
 	_/src/init \
-	_/src/nic_loopback \
+	_/src/nic_bus \
 	_/src/ram_block \
 	_/src/sequence \
 	_/src/solo5 \
 	_/src/$(BIN_NAME) \
 
-include_rules
-
 run ./test_rules.sh \
 	blk \
 	dumpcore \
diff --git a/solo5/test/runtime b/solo5/test/runtime
index 4cd928433..89e18559c 100644
--- a/solo5/test/runtime
+++ b/solo5/test/runtime
@@ -10,13 +10,13 @@
 	</events>
 	  -->
 
+	<requires> <rtc/> </requires>
+
 	<content>
-		<rom label="nic_loopback"/>
 		<rom label="ram_block"/>
 		<rom label="sequence"/>
 		<rom label="solo5.lib.so"/>
 		<rom label="test_blk"/>
-		<rom label="test_dumpcore"/>
 		<rom label="test_exception"/>
 		<rom label="test_fpu"/>
 		<rom label="test_globals"/>
@@ -38,15 +38,11 @@
 			<service name="PD"/>
 			<service name="RM"/>
 			<service name="ROM"/>
+			<service name="Rtc"/>
 			<service name="Timer"/>
 		</parent-provides>
 		<default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>
 
-		<start name="nic_loopback" caps="96">
-			<resource name="RAM" quantum="1M"/>
-			<provides> <service name="Nic"/> </provides>
-		</start>
-
 		<start name="ram_block" caps="96">
 			<resource name="RAM" quantum="9M"/>
 			<provides> <service name="Block"/> </provides>
@@ -56,28 +52,19 @@
 		<start name="test" caps="256">
 			<binary name="sequence"/>
 			<resource name="RAM" quantum="16M"/>
-			<config>
-				<start name="solo5-test_hello">
+			<config ld_verbose="yes">
+				<start name="test_hello">
 					<config>
-						<solo5 cmdline="Hello_Solo5"/>
-						<nic/> <blk/>
+						<cmdline>Hello_Solo5</cmdline>
 					</config>
 				</start>
-				<start name="solo5-test_blk">
-					<config> <block/> </config>
-				</start>
-				<start name="test_dumpcore"/>
+				<start name="test_blk"/>
 				<start name="test_exception"/>
 				<start name="test_fpu"/>
 				<start name="test_globals"/>
-				<start name="test_net"/>
-				<start name="test_net_2if"/>
-				<start name="test_notls"/>
 				<start name="test_quiet"/>
 				<start name="test_ssp"/>
 				<start name="test_time"/>
-				<start name="test_wnox"/>
-				<start name="test_xnow"/>
 			</config>
 		</start>
 	</config>
diff --git a/solo5/test/test_rules.sh b/solo5/test/test_rules.sh
index 1a80ced56..a70b47d70 100755
--- a/solo5/test/test_rules.sh
+++ b/solo5/test/test_rules.sh
@@ -2,6 +2,7 @@
 
 for T in ${@}
 do
-	echo ": foreach ../upstream/tests/test_${T}/*.c |> !cc |> ${T}_%B.o {${T}-obj}"
+	echo ": ../mfttool |> %f gen ../upstream/tests/test_${T}/manifest.json %o |> ${T}_manifest.c {${T}-manifest}"
+	echo ": foreach {${T}-manifest} ../upstream/tests/test_${T}/*.c |> !cc |> %B.o {${T}-obj}"
 	echo ": {${T}-obj} |> !prg |> test_${T} {bin}"
 done
diff --git a/solo5/upstream b/solo5/upstream
index d0ca2cb1b..0a43c262d 160000
--- a/solo5/upstream
+++ b/solo5/upstream
@@ -1 +1 @@
-Subproject commit d0ca2cb1bf77c9467b2ade2269322dc3ec23863c
+Subproject commit 0a43c262df2df0839a1d1a93228b38842db4154c