diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp
index 7d9952c100ae5e9de0c5b0d8641cc6a74f18081e..28a83b50011a1e5a246bfa1e15e2dc3e43b663dc 100644
--- a/src/plugins/projectexplorer/outputparser_test.cpp
+++ b/src/plugins/projectexplorer/outputparser_test.cpp
@@ -134,7 +134,6 @@ void OutputParserTester::stdError(const QString &line)
 void OutputParserTester::appendOutputParser(IOutputParser *parser)
 {
     Q_ASSERT(!childParser());
-    Q_ASSERT(!parser->childParser());
 
     IOutputParser::appendOutputParser(parser);
     parser->appendOutputParser(this);
diff --git a/src/plugins/projectexplorer/outputparser_test.h b/src/plugins/projectexplorer/outputparser_test.h
index 58f51f2d32e4b729bde1c491fde4f859426e99a5..8241766bb5bb6602fcdeeb17548401558ad35d2f 100644
--- a/src/plugins/projectexplorer/outputparser_test.h
+++ b/src/plugins/projectexplorer/outputparser_test.h
@@ -33,6 +33,7 @@
 #if defined(WITH_TESTS)
 
 #include "projectexplorer_export.h"
+#include "metatypedeclarations.h"
 #include "ioutputparser.h"
 
 namespace ProjectExplorer {
diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
index 9cc7595f3ef6d4a5129ab68ebbe4391cf9160454..692d7b30e838ffa5a0c3dd903135a591d8bf33af 100644
--- a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
@@ -174,3 +174,53 @@ void AbldParser::stdError(const QString &line)
     }
     IOutputParser::stdError(line);
 }
+
+// Unit tests:
+
+#ifdef WITH_TESTS
+#   include <QTest>
+
+#   include "qt4projectmanagerplugin.h"
+
+#   include "projectexplorer/outputparser_test.h"
+
+using namespace Qt4ProjectManager::Internal;
+
+void Qt4ProjectManagerPlugin::testAbldOutputParsers_data()
+{
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<OutputParserTester::Channel>("inputChannel");
+    QTest::addColumn<QString>("childStdOutLines");
+    QTest::addColumn<QString>("childStdErrLines");
+    QTest::addColumn<QList<ProjectExplorer::Task> >("tasks");
+    QTest::addColumn<QString>("outputLines");
+
+
+    QTest::newRow("pass-through stdout")
+            << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
+            << QString::fromLatin1("Sometext") << QString()
+            << QList<ProjectExplorer::Task>()
+            << QString();
+    QTest::newRow("pass-through stderr")
+            << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
+            << QString() << QString::fromLatin1("Sometext")
+            << QList<ProjectExplorer::Task>()
+            << QString();
+}
+
+void Qt4ProjectManagerPlugin::testAbldOutputParsers()
+{
+    OutputParserTester testbench;
+    testbench.appendOutputParser(new AbldParser);
+    QFETCH(QString, input);
+    QFETCH(OutputParserTester::Channel, inputChannel);
+    QFETCH(QList<Task>, tasks);
+    QFETCH(QString, childStdOutLines);
+    QFETCH(QString, childStdErrLines);
+    QFETCH(QString, outputLines);
+
+    testbench.testParsing(input, inputChannel,
+                          tasks, childStdOutLines, childStdErrLines,
+                          outputLines);
+}
+#endif
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index eb3b98f98933c776b9765c4154a5da9e029d9299..b78f585a99859254cfad816aaacd8b8cb76cb8d7 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -27,7 +27,6 @@ HEADERS += qt4projectmanagerplugin.h \
     wizards/modulespage.h \
     wizards/filespage.h \
     wizards/qtwizard.h \
-    wizards/targetspage.h \
     wizards/targetsetuppage.h \
     qt4projectmanagerconstants.h \
     makestep.h \
@@ -69,7 +68,6 @@ SOURCES += qt4projectmanagerplugin.cpp \
     wizards/modulespage.cpp \
     wizards/filespage.cpp \
     wizards/qtwizard.cpp \
-    wizards/targetspage.cpp \
     wizards/targetsetuppage.cpp \
     makestep.cpp \
     qmakestep.cpp \
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 096356267cdfc0fe35dc50ef75380bc2f0e9a8d8..674fb048559fd7fd1fdd0d98fd272e0f609428a0 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -266,11 +266,6 @@ void Qt4ProjectManagerPlugin::testBasicProjectLoading()
     QVERIFY(qt4project->rootProjectNode()->projectType() == ApplicationTemplate);
     QVERIFY(m_projectExplorer->currentProject() != 0);
 }
-
-void Qt4ProjectManagerPlugin::testNotYetImplemented()
-{
-    QCOMPARE(1+1, 2);
-}
 #endif
 
 Q_EXPORT_PLUGIN(Qt4ProjectManagerPlugin)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index 1fc0c9f43a5db5ad561fff7330e22c495a695960..b8af4ccf8602a1c92075029b4aa8def2b047632b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -76,7 +76,9 @@ private slots:
 
 #ifdef WITH_TESTS
     void testBasicProjectLoading();
-    void testNotYetImplemented();
+
+    void testAbldOutputParsers_data();
+    void testAbldOutputParsers();
 #endif
 
 private: