Adjust our test suite for USB images

This is just a placeholder ticket.

Code review & rubber-duck: intrigeri

Parent Task: #15292 (closed)

Subtasks

• #16003 (closed)
• #16005 (closed)

Related issues

• Blocked by #16419 (closed)

Original created by @u on 16002 (Redmine)