diff --git a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
index 0b00c25adf13c7e9c7a9274319748e0427db0336..60da31d6467a0676a8c5af6d7f0ecc9d12700f07 100644
--- a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
+++ b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
@@ -81,6 +81,7 @@ static QString useKindToString(UseKind useKind)
 }
 
 // The following two functions are "enhancements" for QCOMPARE().
+QT_BEGIN_NAMESPACE
 namespace QTest {
 
 template<>
@@ -96,6 +97,7 @@ char *toString(const Use &use)
 }
 
 } // namespace QTest
+QT_END_NAMESPACE
 
 namespace {
 
diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
index 834a5790925a872bd1ff3ed93f2e594e9fadc747..2594bc692f6f796483c106f4bada75c46e34eb75 100644
--- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
+++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
@@ -30,6 +30,7 @@
 #include <cplusplus/pp.h>
 
 #include <QtTest>
+#include <QFile>
 #include <QHash>
 
 //TESTED_COMPONENT=src/libs/cplusplus
diff --git a/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp b/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp
index 79f2f5ee84affb700fe480b886e8d272e7a12406..3ce2958bbcd9e9bbdc202108591ea566d05bdf56 100644
--- a/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp
+++ b/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp
@@ -139,8 +139,8 @@ void SimplifyTypesTest::testCase1_data()
     QTest::addColumn<QString>("expected");
     const size_t count = sizeof(input)/sizeof(const char *);
     for (size_t i = 0; i < count; i++ )
-        QTest::newRow(description[i]) << QString::fromAscii(input[i])
-                                      << QString::fromAscii(output[i]);
+        QTest::newRow(description[i]) << QString::fromLatin1(input[i])
+                                      << QString::fromLatin1(output[i]);
 }
 
 QTEST_APPLESS_MAIN(SimplifyTypesTest);