diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h
index 11a2da4ee45..9f80018a752 100644
--- a/src/libs/extensionsystem/pluginspec.h
+++ b/src/libs/extensionsystem/pluginspec.h
@@ -60,6 +60,8 @@ struct EXTENSIONSYSTEM_EXPORT PluginDependency
         Optional
     };
 
+    PluginDependency() : type(Required) {}
+
     QString name;
     QString version;
     Type type;
diff --git a/tests/auto/cplusplus/findusages/tst_findusages.cpp b/tests/auto/cplusplus/findusages/tst_findusages.cpp
index be711cc2d77..f09a07680dc 100644
--- a/tests/auto/cplusplus/findusages/tst_findusages.cpp
+++ b/tests/auto/cplusplus/findusages/tst_findusages.cpp
@@ -89,7 +89,7 @@ void tst_FindUsages::inlineMethod()
     QVERIFY(arg);
     QCOMPARE(arg->identifier()->chars(), "arg");
 
-    FindUsages findUsages(doc, snapshot);
+    FindUsages findUsages(QByteArray(), doc, snapshot);
     findUsages(arg);
     QCOMPARE(findUsages.usages().size(), 2);
     QCOMPARE(findUsages.references().size(), 2);
@@ -148,7 +148,7 @@ void tst_FindUsages::objc_args()
     Argument *arg = methodImpl->argumentAt(0)->asArgument();
     QCOMPARE(arg->identifier()->chars(), "arg");
 
-    FindUsages findUsages(doc, snapshot);
+    FindUsages findUsages(QByteArray(), doc, snapshot);
     findUsages(arg);
     QCOMPARE(findUsages.usages().size(), 2);
     QCOMPARE(findUsages.references().size(), 2);
@@ -186,7 +186,7 @@ void tst_FindUsages::qproperty_1()
     QCOMPARE(setX_method->identifier()->chars(), "setX");
     QCOMPARE(setX_method->argumentCount(), 1U);
 
-    FindUsages findUsages(doc, snapshot);
+    FindUsages findUsages(QByteArray(), doc, snapshot);
     findUsages(setX_method);
     QCOMPARE(findUsages.usages().size(), 2);
     QCOMPARE(findUsages.references().size(), 2);
diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
index bb9383164f6..847520b8480 100644
--- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
+++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
@@ -228,8 +228,8 @@ void tst_PluginSpec::resolveDependencies()
     Internal::PluginManagerPrivate::privateSpec(spec5)->read("testdependencies/spec5.xml");
     QVERIFY(spec1Priv->resolveDependencies(specs));
     QCOMPARE(spec1Priv->dependencySpecs.size(), 2);
-    QVERIFY(spec1Priv->dependencySpecs.contains(spec2));
-    QVERIFY(spec1Priv->dependencySpecs.contains(spec3));
+    QVERIFY(!spec1Priv->dependencySpecs.key(spec2).name.isEmpty());
+    QVERIFY(!spec1Priv->dependencySpecs.key(spec3).name.isEmpty());
     QCOMPARE(spec1Priv->state, PluginSpec::Resolved);
     QVERIFY(!spec4Priv->resolveDependencies(specs));
     QVERIFY(spec4Priv->hasError);
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index b01b54f4683..8a63bc7c434 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -11,12 +11,10 @@ UTILSDIR = ../../../src/libs
 SOURCES += \
         $$FAKEVIMDIR/fakevimhandler.cpp \
         $$FAKEVIMDIR/fakevimactions.cpp \
-        $$FAKEVIMDIR/fakevimsyntax.cpp \
         tst_fakevim.cpp
 
 HEADERS += \
         $$FAKEVIMDIR/fakevimhandler.h \
-        $$FAKEVIMDIR/fakevimactions.h \
-        $$FAKEVIMDIR/fakevimsyntax.h \
+        $$FAKEVIMDIR/fakevimactions.h
 
 INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
diff --git a/tests/tools/cplusplus-dump/dumpers.inc b/tests/tools/cplusplus-dump/dumpers.inc
index 9028f073696..a30bc5fe642 100644
--- a/tests/tools/cplusplus-dump/dumpers.inc
+++ b/tests/tools/cplusplus-dump/dumpers.inc
@@ -1576,7 +1576,7 @@ virtual bool visit(LambdaCaptureAST *ast)
     return false;
 }
 
-virtual bool visit(CaptureAST *ast)
+virtual bool visit(CaptureAST *)
 {
     return false;
 }