diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run
index 4db7f10113..59a1d3a65b 100644
--- a/repos/os/run/demo.run
+++ b/repos/os/run/demo.run
@@ -2,7 +2,10 @@
 # Build
 #
 
-if {[have_spec odroid_xu]} {
+if {[have_spec odroid_xu] ||
+    [have_spec wand_quad] ||
+    ([get_cmd_switch --autopilot] && [have_spec linux]) ||
+    ([get_cmd_switch --autopilot] && [have_include "power_on/qemu"])} {
 	puts "Run script does not support this platform."
 	exit 0
 }
@@ -66,13 +69,19 @@ append_if [have_spec sdl] config {
 append_platform_drv_config
 
 append_if [have_spec framebuffer] config {
-	<start name="fb_drv">
+	<start name="fb_drv" caps="130">
+		<provides><service name="Framebuffer"/></provides>}
+append_if [expr [have_spec framebuffer] && [have_spec x86]] config {
 		<resource name="RAM" quantum="4M"/>
-		<provides><service name="Framebuffer"/></provides>
+		<config width="1024" height="768"/>
+	</start>}
+append_if [expr [have_spec framebuffer] && ![have_spec x86]] config {
+		<resource name="RAM" quantum="5M"/>
+		<config/>
 	</start>}
 
 append_if [have_spec gpio] config "
-	<start name=\"[gpio_drv]\">
+	<start name=\"[gpio_drv]\" caps=\"140\">
 		<resource name=\"RAM\" quantum=\"4M\"/>
 		<provides><service name=\"Gpio\"/></provides>
 		<config/>
@@ -87,7 +96,7 @@ append_if [have_spec imx53] config {
 
 append_if [have_spec ps2] config {
 	<start name="ps2_drv">
-		<resource name="RAM" quantum="1M"/>
+		<resource name="RAM" quantum="1096K"/>
 		<provides><service name="Input"/></provides>
 	</start>}
 
@@ -118,7 +127,7 @@ append config {
 
 	<start name="nitpicker_config">
 		<binary name="rom_filter"/>
-		<resource name="RAM" quantum="1M"/>
+		<resource name="RAM" quantum="1096K"/>
 		<provides><service name="ROM"/></provides>
 		<config>
 			<input name="xray_enabled" rom="xray" node="xray">
@@ -176,7 +185,7 @@ append config {
 	</start>
 
 	<start name="global_keys_handler">
-		<resource name="RAM" quantum="1M"/>
+		<resource name="RAM" quantum="1096K"/>
 		<config>
 			<bool name="xray" initial="no"/>
 
@@ -197,8 +206,8 @@ append config {
 		</route>
 	</start>
 
-	<start name="nitpicker">
-		<resource name="RAM" quantum="1M"/>
+	<start name="nitpicker" caps="110">
+		<resource name="RAM" quantum="1216K"/>
 		<provides><service name="Nitpicker"/></provides>
 		<configfile name="nitpicker.config"/>
 		<route>
@@ -213,7 +222,7 @@ append config {
 	</start>
 
 	<start name="pointer">
-		<resource name="RAM" quantum="1M"/>
+		<resource name="RAM" quantum="1096K"/>
 		<config/>
 	</start>
 
@@ -228,7 +237,7 @@ append config {
 	</start>
 
 	<start name="status_bar">
-		<resource name="RAM" quantum="1M"/>
+		<resource name="RAM" quantum="1096K"/>
 		<route>
 			<service name="ROM" label="focus"> <child name="report_rom"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
@@ -293,4 +302,20 @@ append_platform_drv_boot_modules
 build_boot_image $boot_modules
 
 
-run_genode_until forever
+if {[get_cmd_switch --autopilot]} {
+	run_genode_until {\[init -> scout\] png is.*\n} 40
+
+	grep_output {(requests resources: ram_quota)|(Error)}
+
+	# remove Error messages which are not fatal, mostly
+	unify_output {(?n)^.*platform_drv] Error:.*ACPI table information is wrong.*$} ""
+	unify_output {(?n)^.*platform_drv] Error:  adjust size from.*$} ""
+	unify_output {(?n)^.*acpi_drv] Error:.*platform_info.*$} ""
+	unify_output {(?n)^.*ps2_drv] Error: no data available.*$} ""
+	unify_output {(?n)^.*ps2_drv] Error: failed to read from port.*$} ""
+
+	compare_output_to {}
+
+} else {
+	run_genode_until forever
+}
diff --git a/tool/autopilot.list b/tool/autopilot.list
index f188cac2b5..ee7b72b2d6 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -109,3 +109,4 @@ ada
 fs_report
 log_core
 utf8
+demo