diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run
index bbc8c0cac3..3d3ac7f791 100644
--- a/repos/gems/run/depot_autopilot.run
+++ b/repos/gems/run/depot_autopilot.run
@@ -630,7 +630,8 @@ proc exit {{status 0}} {
 if {[expr ![have_spec x86] && \
           ![have_spec arm_v6] && \
           ![have_spec arm_v7a] && \
-          ![have_spec arm_v8a]]} \
+          ![have_spec arm_v8a] && \
+          ![have_spec riscv]]} \
 {
 	puts "\n Run script is not supported on this platform. \n";
 	exit 0
@@ -768,6 +769,17 @@ set skip_test(test-spark_exception) [expr [have_spec arm]]
 set skip_test(test-tcp_bulk_lwip)   [expr ![have_spec x86] && ![have_include "power_on/qemu"]]
 set skip_test(test-tcp_bulk_lxip)   [expr ![have_spec x86] && ![have_include "power_on/qemu"]]
 
+if {[have_spec riscv]} {
+	set skip_test(gcov)                              true
+	set skip_test(test-libc_connect_lxip)            true
+	set skip_test(test-libc_connect_vfs_server_lxip) true
+	set skip_test(test-spark)                        true
+	set skip_test(test-spark_exception)              true
+	set skip_test(test-spark_secondary_stack)        true
+	set skip_test(test-tcp_bulk_lxip)                true
+	set skip_test(test-xml_generator)                true
+}
+
 #
 # FIXME
 #
diff --git a/repos/gems/src/app/depot_autopilot/config.xsd b/repos/gems/src/app/depot_autopilot/config.xsd
index abc5957068..c173042808 100644
--- a/repos/gems/src/app/depot_autopilot/config.xsd
+++ b/repos/gems/src/app/depot_autopilot/config.xsd
@@ -19,6 +19,7 @@
 			<xs:enumeration value="arm_v6" />
 			<xs:enumeration value="arm_v7a" />
 			<xs:enumeration value="arm_v8a" />
+			<xs:enumeration value="riscv" />
 		</xs:restriction>
 	</xs:simpleType><!-- Architecture -->