diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 4cbc17d32933eac51effe5e49f27fbb59e29d1c4..3cafe99c5afcca1e3f022dd72db39dc5b8ba8dbc 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -5,6 +5,7 @@ dll {
 }
 
 INCLUDEPATH += $$PWD
+QT += network
 
 SOURCES += $$PWD/environment.cpp \
     $$PWD/reloadpromptutils.cpp \
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index f89b4c65f01d90e032a37acb071ebb6f0a407314..f662f2cb55533311d04544e6375958102e0c90a0 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -2,4 +2,5 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
 include(../../../../qtcreator.pri)
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
-include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri)
+include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus-lib.pri)
+include($$IDE_SOURCE_TREE/src/libs/utils/utils-lib.pri)
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index d3a2044d48a4592e2f79c0c2efa22d9b0c976221..083a32e2c40b4414305bdbf5da324bbd5746060a 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -3,6 +3,8 @@ CONFIG += qtestlib testcase
 # Defines import symbol as empty
 DEFINES+=QTCREATOR_UTILS_STATIC_LIB
 
+include(../../../src/libs/utils/utils-lib.pri)
+
 FAKEVIMDIR = ../../../src/plugins/fakevim
 UTILSDIR = ../../../src/libs
 
@@ -10,17 +12,11 @@ SOURCES += \
 	$$FAKEVIMDIR/fakevimhandler.cpp \
 	$$FAKEVIMDIR/fakevimactions.cpp \
 	$$FAKEVIMDIR/fakevimsyntax.cpp \
-	$$UTILSDIR/utils/savedaction.cpp \
-	$$UTILSDIR/utils/pathchooser.cpp \
-	$$UTILSDIR/utils/basevalidatinglineedit.cpp \
         tst_fakevim.cpp
 
 HEADERS += \
 	$$FAKEVIMDIR/fakevimhandler.h \
 	$$FAKEVIMDIR/fakevimactions.h \
 	$$FAKEVIMDIR/fakevimsyntax.h \
-	$$UTILSDIR/utils/savedaction.h \
-	$$UTILSDIR/utils/pathchooser.h \
-	$$UTILSDIR/utils/basevalidatinglineedit.h \
 
 INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
diff --git a/tests/manual/fakevim/fakevim.pro b/tests/manual/fakevim/fakevim.pro
index b6a887707629495129d3d4be95f0a58a64802ad9..b36e53421dacfdff2151ed1178a81fe2390be6af 100644
--- a/tests/manual/fakevim/fakevim.pro
+++ b/tests/manual/fakevim/fakevim.pro
@@ -1,24 +1,20 @@
-
 FAKEVIMHOME = ../../../src/plugins/fakevim
 UTILSDIR = ../../../src/libs
 
 DEFINES += QTCREATOR_UTILS_STATIC_LIB
+
+include(../../../src/libs/utils/utils-lib.pri)
+
 SOURCES += \
 	main.cpp \
 	$$FAKEVIMHOME/fakevimhandler.cpp \
 	$$FAKEVIMHOME/fakevimactions.cpp \
-	$$FAKEVIMHOME/fakevimsyntax.cpp \
-	$$UTILSDIR/utils/savedaction.cpp \
-	$$UTILSDIR/utils/pathchooser.cpp \
-	$$UTILSDIR/utils/basevalidatinglineedit.cpp \
+        $$FAKEVIMHOME/fakevimsyntax.cpp
 
 HEADERS += \
 	$$FAKEVIMHOME/fakevimhandler.h \
 	$$FAKEVIMHOME/fakevimactions.h \
-	$$FAKEVIMHOME/fakevimsyntax.h \
-	$$UTILSDIR/utils/savedaction.h \
-	$$UTILSDIR/utils/pathchooser.h \
-	$$UTILSDIR/utils/basevalidatinglineedit.h \
+        $$FAKEVIMHOME/fakevimsyntax.h
 
 INCLUDEPATH += $$FAKEVIMHOME $$UTILSDIR
 
diff --git a/tests/manual/ssh/main.cpp b/tests/manual/ssh/main.cpp
index 3a17c436fa3efe26e09c389bdbfa6ad4149cef1b..46f74603ea8b083225589b89216e27340b9a8f21 100644
--- a/tests/manual/ssh/main.cpp
+++ b/tests/manual/ssh/main.cpp
@@ -27,12 +27,12 @@ public:
         if (m_connection->createSftpChannel())
             qDebug("Error: Unconnected SSH connection creates SFTP channel.");
 
-        SshConnectionParameters noHost;
+        SshConnectionParameters noHost=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
         noHost.host = QLatin1String("hgdfxgfhgxfhxgfchxgcf");
         noHost.port = 12345;
         noHost.timeout = 10;
 
-        SshConnectionParameters noUser;
+        SshConnectionParameters noUser=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
         noUser.host = QLatin1String("localhost");
         noUser.port = 22;
         noUser.timeout = 30;
@@ -40,7 +40,7 @@ public:
         noUser.uname = QLatin1String("dumdidumpuffpuff");
         noUser.uname = QLatin1String("whatever");
 
-        SshConnectionParameters wrongPwd;
+        SshConnectionParameters wrongPwd=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
         wrongPwd.host = QLatin1String("localhost");
         wrongPwd.port = 22;
         wrongPwd.timeout = 30;
@@ -48,7 +48,7 @@ public:
         wrongPwd.uname = QLatin1String("root");
         noUser.uname = QLatin1String("thiscantpossiblybeapasswordcanit");
 
-        SshConnectionParameters invalidKeyFile;
+        SshConnectionParameters invalidKeyFile=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
         invalidKeyFile.host = QLatin1String("localhost");
         invalidKeyFile.port = 22;
         invalidKeyFile.timeout = 30;