diff --git a/run/pkcs11_tool.run b/run/pkcs11_tool.run
index 3e8f7725f..0d3db4d6d 100644
--- a/run/pkcs11_tool.run
+++ b/run/pkcs11_tool.run
@@ -52,36 +52,27 @@ set usb_dev_addr $::env(USB_DEV_ADDR)
#
set test_id 2
-#
-# Build
-#
-set build_components {
- core
- init
- timer
- drivers/usb_host
- server/report_rom
- lib/vfs_pipe
-}
-
-source ${genode_dir}/repos/base/run/platform_drv.inc
-
-append_platform_drv_build_components
-
-build $build_components
-
create_boot_directory
-import_from_depot [depot_user]/src/pkcs11_tool/2022-06-21 \
- [depot_user]/src/openssl \
- [depot_user]/src/stdcxx \
- [depot_user]/src/opensc_pkcs11 \
- [depot_user]/src/posix \
- [depot_user]/src/libc \
- [depot_user]/src/vfs \
- [depot_user]/src/pcsc-lite \
- [depot_user]/src/libusb \
- [depot_user]/src/vfs_libusb
+lappend depot_archives [depot_user]/src/[base_src] \
+ [depot_user]/pkg/drivers_managed-[board] \
+ [depot_user]/src/black_hole \
+ [depot_user]/src/init \
+ [depot_user]/src/libc \
+ [depot_user]/src/libusb \
+ [depot_user]/src/opensc_pkcs11 \
+ [depot_user]/src/openssl \
+ [depot_user]/src/pcsc-lite \
+ [depot_user]/src/posix \
+ [depot_user]/src/report_rom \
+ [depot_user]/src/rom_filter \
+ [depot_user]/src/stdcxx \
+ [depot_user]/src/vfs \
+ [depot_user]/src/vfs_pipe \
+ [depot_user]/src/vfs_libusb \
+ mstein/src/pkcs11_tool/2022-06-21 \
+
+import_from_depot $depot_archives
append config {
@@ -96,43 +87,90 @@ append config {
+
-
+
- }
-append_platform_drv_config
-
-append config {
+
-
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -236,7 +274,9 @@ append config {
-
+
+
+
@@ -244,22 +284,10 @@ append config {
install_config $config
-append boot_modules {
- core
- ld.lib.so
- init
- timer
- } [usb_host_drv_binary] {
- report_rom
- vfs_pipe.lib.so
-}
-
-append_platform_drv_boot_modules
-
-build_boot_image $boot_modules
+build_boot_image [build_artifacts]
append qemu_args " -nographic "
-append qemu_args " -device nec-usb-xhci,id=xhci "
+append qemu_args " -usb -device nec-usb-xhci,id=xhci "
append qemu_args " -device usb-host,hostbus=$usb_bus_addr,hostaddr=$usb_dev_addr,bus=xhci.0 "
run_genode_until forever