diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index e57223e9824..49628ccfd74 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -307,17 +307,16 @@ void GenericLinuxDeviceTester::testDevice(const IDevice::Ptr &deviceConfiguratio
 
     d->m_device = deviceConfiguration;
 
-    QList<GroupItem> taskItems = {
+    const Group root {
         d->echoTask("Hello"), // No quoting necessary
         d->echoTask("Hello Remote World!"), // Checks quoting, too.
         d->unameTask(),
         d->gathererTask(),
-        d->transferTasks()
+        d->transferTasks(),
+        d->m_extraTests,
+        d->commandTasks()
     };
-    if (!d->m_extraTests.isEmpty())
-        taskItems << Group { d->m_extraTests };
-    taskItems << d->commandTasks();
-    d->m_taskTreeRunner.start(taskItems);
+    d->m_taskTreeRunner.start(root);
 }
 
 void GenericLinuxDeviceTester::stopTest()