diff --git a/doc/configuration.rst b/doc/configuration.rst
index 1a1ecba3e..37cdf8843 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -543,7 +543,7 @@ Used by:
   - `USBStorageDriver`_
 
 The NetworkUSBMassStorage can be used in test cases by calling the
-`write_image()`, and `get_size()` functions.
+`write_files()`, `write_image()`, and `get_size()` functions.
 
 SigrokDevice
 ~~~~~~~~~~~~
diff --git a/labgrid/driver/usbstoragedriver.py b/labgrid/driver/usbstoragedriver.py
index 0f88d7bd4..d699ebcc1 100644
--- a/labgrid/driver/usbstoragedriver.py
+++ b/labgrid/driver/usbstoragedriver.py
@@ -1,6 +1,8 @@
 import enum
 import logging
 import os
+import pathlib
+import re
 import time
 import subprocess
 
@@ -43,6 +45,8 @@ class USBStorageDriver(Driver):
     )
     WAIT_FOR_MEDIUM_TIMEOUT = 10.0 # s
     WAIT_FOR_MEDIUM_SLEEP = 0.5 # s
+    UNMOUNT_MAX_RETRIES = 5
+    UNMOUNT_BUSY_WAIT = 3 # s
 
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
@@ -54,6 +58,115 @@ def on_activate(self):
     def on_deactivate(self):
         pass
 
+    def _mount(self, partition):
+        target = self._get_devpath(partition)
+        args = ["udisksctl", "mount", "--no-user-interaction", "-b", target]
+        self._wait_for_medium(partition)
+
+        try:
+            result = processwrapper.check_output(self.storage.command_prefix + args)
+        except subprocess.CalledProcessError as e:
+            output = e.output.decode('utf-8').rstrip()
+            self.logger.warning('%s', output)
+
+            # udisksctl's already mounted error message does't inspire confidence
+            # with respect to stability, so we best effort match it and unmount/remount
+            # or bail out. Message is currently:
+            # Error mounting ...: GDBus.Error:org.freedesktop.UDisks2.Error.AlreadyMounted:
+            # Device ... is already mounted at `...'.
+            if re.search('already.?mounted', output, re.IGNORECASE) is None:
+                raise e
+
+            self.logger.warning('Unmounting lazily and remounting %s...', target)
+            self._unmount_lazy(partition)
+            result = processwrapper.check_output(self.storage.command_prefix + args)
+
+        capture = re.search('^Mounted (.*) at (.*)$', result.decode('utf-8'))
+        if capture is None:
+            self._unmount_lazy(partition)
+            raise RuntimeError("couldn't determine mount path")
+
+        return capture.group(2)
+
+    def _unmount_lazy(self, partition):
+        target = self._get_devpath(partition)
+        args = ["udisksctl", "unmount", "--no-user-interaction", "-b", target, "--force"]
+
+        try:
+            processwrapper.check_output(self.storage.command_prefix + args)
+        except subprocess.CalledProcessError as e:
+            # Error unmounting ...: GDBus.Error:org.freedesktop.UDisks2.Error.NotMounted:
+            # Device `...' is not mounted
+            if re.search(b'not.?mounted', e.output, re.IGNORECASE) is None:
+                raise
+
+    def _unmount(self, partition):
+        target = self._get_devpath(partition)
+        args = ["udisksctl", "unmount", "--no-user-interaction", "-b", target]
+
+        for _ in range(self.UNMOUNT_MAX_RETRIES):
+            try:
+                processwrapper.check_output(self.storage.command_prefix + args)
+                return
+            except subprocess.CalledProcessError as e:
+                output = e.output.decode('utf-8').rstrip()
+                # Error unmounting ...: GDBus.Error:org.freedesktop.UDisks2.Error.DeviceBusy:
+                # Error unmounting ...: target is busy
+                if re.search('busy', output) is None:
+                    raise e
+
+                self.logger.info('%s wait for %s s', output, self.UNMOUNT_BUSY_WAIT)
+                time.sleep(self.UNMOUNT_BUSY_WAIT)
+
+        # Last resort: raise an exception to trigger the lazy unmount
+        raise ExecutionError(f"Timeout while waiting to unmount {target}")
+
+    @Driver.check_active
+    @step(args=['sources', 'target', 'partition', 'target_is_directory'])
+    def write_files(self, sources, target, partition, target_is_directory=True):
+        """
+        Write the file(s) specified by filename(s) to the
+        bound USB storage partition.
+
+        Args:
+            sources (List[str]): path(s) to the file(s) to be copied to the bound USB storage
+                partition.
+            target (str): target directory or file to copy to
+            partition (int): mount the specified partition or None to mount the whole disk
+            target_is_directory (bool): Whether target is a directory
+        """
+
+        mount_path = self._mount(partition)
+
+        try:
+            # (pathlib.PurePath(...) / "/") == "/", so we turn absolute paths into relative
+            # paths with respect to the mount point here
+            target_rel = target.relative_to(target.root) if target.root is not None else target
+            target_path = str(pathlib.PurePath(mount_path) / target_rel)
+
+            copied_sources = []
+
+            for f in sources:
+                mf = ManagedFile(f, self.storage)
+                mf.sync_to_resource()
+                copied_sources = copied_sources + [mf.get_remote_path()]
+
+            if target_is_directory:
+                args = ["cp", "-t", target_path] + copied_sources
+            else:
+                if len(sources) != 1:
+                    raise ValueError("single source argument required when target_is_directory=False")
+
+                args = ["cp", "-T", copied_sources[0], target_path]
+
+            processwrapper.check_output(self.storage.command_prefix + args)
+            self._unmount(partition)
+        except:
+            # We are going to die with an exception anyway, so no point in waiting
+            # to make sure everything has been written before continuing
+            self._unmount_lazy(partition)
+            raise
+
     @Driver.check_active
     @step(args=['filename'])
     def write_image(self, filename=None, mode=Mode.DD, partition=None, skip=0, seek=0):