diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 2747298663b..7ae098ca524 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -16,26 +16,26 @@ msvc {
 } else {
 
     SOURCES += \
+        $$IDE_SOURCE_TREE/src/libs/utils/commandline.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/environment.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/fileutils.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/hostosinfo.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/namevaluedictionary.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/namevalueitem.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/treemodel.cpp \
-        $$IDE_SOURCE_TREE/src/libs/utils/processargs.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/qtcassert.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/qtcprocess.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/processhandle.cpp \
         $$IDE_SOURCE_TREE/src/libs/utils/savefile.cpp
 
     HEADERS += \
+        $$IDE_SOURCE_TREE/src/libs/utils/commandline.h \
         $$IDE_SOURCE_TREE/src/libs/utils/environment.h \
         $$IDE_SOURCE_TREE/src/libs/utils/fileutils.h \
         $$IDE_SOURCE_TREE/src/libs/utils/hostosinfo.h \
         $$IDE_SOURCE_TREE/src/libs/utils/namevaluedictionary.h \
         $$IDE_SOURCE_TREE/src/libs/utils/namevalueitem.h \
         $$IDE_SOURCE_TREE/src/libs/utils/treemodel.h \
-        $$IDE_SOURCE_TREE/src/libs/utils/processargs.h \
         $$IDE_SOURCE_TREE/src/libs/utils/qtcassert.h \
         $$IDE_SOURCE_TREE/src/libs/utils/qtcprocess.h \
         $$IDE_SOURCE_TREE/src/libs/utils/processhandle.h \
diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro
index d24b1ea199b..d09e1a76745 100644
--- a/tests/auto/debugger/gdb.pro
+++ b/tests/auto/debugger/gdb.pro
@@ -17,24 +17,24 @@ HEADERS += \
 
 !msvc {
     SOURCES += \
+        $$UTILSDIR/commandline.cpp \
         $$UTILSDIR/environment.cpp \
         $$UTILSDIR/fileutils.cpp \
         $$UTILSDIR/hostosinfo.cpp \
         $$UTILSDIR/namevaluedictionary.cpp \
         $$UTILSDIR/namevalueitem.cpp \
-        $$UTILSDIR/processargs.cpp \
         $$UTILSDIR/qtcassert.cpp \
         $$UTILSDIR/qtcprocess.cpp \
         $$UTILSDIR/processhandle.cpp \
         $$UTILSDIR/savefile.cpp \
 
     HEADERS += \
+        $$UTILSDIR/commandline.h \
         $$UTILSDIR/environment.h \
         $$UTILSDIR/fileutils.h \
         $$UTILSDIR/hostosinfo.h \
         $$UTILSDIR/namevaluedictionary.h \
         $$UTILSDIR/namevalueitem.h \
-        $$UTILSDIR/processargs.h \
         $$UTILSDIR/qtcassert.h \
         $$UTILSDIR/qtcprocess.h \
         $$UTILSDIR/processhandle.h \
diff --git a/tests/auto/debugger/protocol.pro b/tests/auto/debugger/protocol.pro
index 23ac8095e19..0119d258674 100644
--- a/tests/auto/debugger/protocol.pro
+++ b/tests/auto/debugger/protocol.pro
@@ -17,24 +17,24 @@ HEADERS += \
 
 !msvc {
     SOURCES += \
+        $$UTILSDIR/commandline.cpp \
         $$UTILSDIR/environment.cpp \
         $$UTILSDIR/fileutils.cpp \
         $$UTILSDIR/hostosinfo.cpp \
         $$UTILSDIR/namevaluedictionary.cpp \
         $$UTILSDIR/namevalueitem.cpp \
-        $$UTILSDIR/processargs.cpp \
         $$UTILSDIR/qtcassert.cpp \
         $$UTILSDIR/qtcprocess.cpp \
         $$UTILSDIR/processhandle.cpp \
         $$UTILSDIR/savefile.cpp \
 
     HEADERS += \
+        $$UTILSDIR/commandline.h \
         $$UTILSDIR/environment.h \
         $$UTILSDIR/fileutils.h \
         $$UTILSDIR/hostosinfo.h \
         $$UTILSDIR/namevaluedictionary.h \
         $$UTILSDIR/namevalueitem.h \
-        $$UTILSDIR/processargs.h \
         $$UTILSDIR/qtcassert.h \
         $$UTILSDIR/qtcprocess.h \
         $$UTILSDIR/processhandle.h \