diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index ce4530ca8c5..fa12ab6449f 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -3,13 +3,12 @@ TEMPLATE = subdirs
 SUBDIRS = qtpromaker \
      qmlpuppet \
      ../plugins/cpaster/frontend \
-     sdktool
+     sdktool \
+     valgrindfake
 
 win32 {
     SUBDIRS += qtcdebugger
     SUBDIRS += wininterrupt
-} else {
-    SUBDIRS += valgrindfake
 }
 
 QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
diff --git a/src/tools/valgrindfake/main.cpp b/src/tools/valgrindfake/main.cpp
index 78e479e55df..ea2fc188b35 100644
--- a/src/tools/valgrindfake/main.cpp
+++ b/src/tools/valgrindfake/main.cpp
@@ -71,12 +71,12 @@ int main(int argc, char** argv)
     uint arg_wait = 0;
 
     const QProcessEnvironment sysEnv = QProcessEnvironment::systemEnvironment();
-    arg_xmlFile = sysEnv.value("QCIT_INPUT_FILE");
+    arg_xmlFile = sysEnv.value(QLatin1String("QCIT_INPUT_FILE"));
 
     for (int i = 1; i < args.size(); ++i) {
         const QString& arg = args.at(i);
         if (arg.startsWith(QLatin1String("--xml-socket="))) {
-            arg_server = arg.mid(13, arg.indexOf(':') - 13);
+            arg_server = arg.mid(13, arg.indexOf(QLatin1Char(':')) - 13);
             arg_port = arg.mid(13 + arg_server.length() + 1);
         } else if (args.size() > i + 1
                     && (args.at(i) == QLatin1String("-i")
diff --git a/src/tools/valgrindfake/outputgenerator.cpp b/src/tools/valgrindfake/outputgenerator.cpp
index 578b9c1d519..5d797e601f7 100644
--- a/src/tools/valgrindfake/outputgenerator.cpp
+++ b/src/tools/valgrindfake/outputgenerator.cpp
@@ -30,6 +30,8 @@
 
 #include "outputgenerator.h"
 
+#include <utils/sleep.h>
+
 #include <QAbstractSocket>
 #include <QIODevice>
 #include <QTextStream>
@@ -37,8 +39,6 @@
 #include <QStringList>
 #include <QDebug>
 
-#include <unistd.h>
-
 using namespace Valgrind::Fake;
 
 OutputGenerator::OutputGenerator(QAbstractSocket *output, QIODevice *input) :
@@ -104,7 +104,7 @@ void OutputGenerator::produceRuntimeError()
         m_output->flush();
     } else if (m_wait) {
         qDebug() << "waiting in fake valgrind for " << m_wait << " seconds..." << endl;
-        sleep(m_wait);
+        Utils::sleep(1000 * m_wait);
     }
 }
 
diff --git a/src/tools/valgrindfake/valgrindfake.pro b/src/tools/valgrindfake/valgrindfake.pro
index 7bded95bb50..bd7eae2cdaa 100644
--- a/src/tools/valgrindfake/valgrindfake.pro
+++ b/src/tools/valgrindfake/valgrindfake.pro
@@ -10,3 +10,7 @@ isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/../../shared/qtcreator_pc
 HEADERS += outputgenerator.h
 SOURCES += main.cpp \
     outputgenerator.cpp
+
+QTC_LIB_DEPENDS += \
+    utils
+include(../../../qtcreator.pri)
diff --git a/src/tools/valgrindfake/valgrindfake.qbs b/src/tools/valgrindfake/valgrindfake.qbs
index 26d68ac609d..ddedef4e80a 100644
--- a/src/tools/valgrindfake/valgrindfake.qbs
+++ b/src/tools/valgrindfake/valgrindfake.qbs
@@ -3,8 +3,8 @@ import qbs
 CppApplication {
     name: "valgrind-fake"
     type: "application"
-    condition: qbs.targetOS.contains("unix")
     destinationDirectory: project.ide_bin_path
+    Depends { name: "Utils" }
     Depends { name: "Qt"; submodules: ["network", "xml"]; }
     files: [
         "main.cpp",
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 942c4a3515b..cd17e2ea4d5 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -15,11 +15,8 @@ SUBDIRS += \
     qtcprocess \
     utils \
     utils_stringutils \
-    filesearch
-
-!win32 {
-    SUBDIRS += valgrind
-}
+    filesearch \
+    valgrind
 
 #contains (QT_CONFIG, declarative) {
 #SUBDIRS += qml
diff --git a/tests/auto/valgrind/valgrind.qbs b/tests/auto/valgrind/valgrind.qbs
index 54516b31b5a..3025b5bc2cb 100644
--- a/tests/auto/valgrind/valgrind.qbs
+++ b/tests/auto/valgrind/valgrind.qbs
@@ -2,7 +2,7 @@ import qbs
 
 Project {
     name: "Valgrind autotests"
-    condition: qbs.targetOS.contains("unix")
+    condition: qbs.targetOS.contains("unix") // FIXME: doesn't link on Windows
     references: [
         "callgrind/callgrind.qbs",
         "memcheck/memcheck.qbs"