diff --git a/tests/auto/cplusplus/codegen/tst_codegen.cpp b/tests/auto/cplusplus/codegen/tst_codegen.cpp
index c53dfad3cdd..c536305be68 100644
--- a/tests/auto/cplusplus/codegen/tst_codegen.cpp
+++ b/tests/auto/cplusplus/codegen/tst_codegen.cpp
@@ -6,7 +6,7 @@
 #include <Scope.h>
 #include <TranslationUnit.h>
 #include <Literals.h>
-#include <Semantic.h>
+#include <Bind.h>
 #include <Symbols.h>
 
 #include <QtTest>
diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp
index 42b986f86e7..52541b168c8 100644
--- a/tests/auto/cplusplus/semantic/tst_semantic.cpp
+++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp
@@ -8,7 +8,7 @@
 #include <Parser.h>
 #include <AST.h>
 #include <ASTVisitor.h>
-#include <Semantic.h>
+#include <Bind.h>
 #include <Scope.h>
 #include <Symbols.h>
 #include <CoreTypes.h>
@@ -62,16 +62,14 @@ public:
         {
             QVERIFY(unit);
             QVERIFY(unit->ast());
-            Semantic sem(unit);
+            Bind bind(unit);
             TranslationUnitAST *ast = unit->ast()->asTranslationUnit();
             QVERIFY(ast);
-            for (DeclarationListAST *decl = ast->declaration_list; decl; decl = decl->next) {
-                sem.check(decl->value, globals);
-            }
+            bind(ast, globals);
         }
 
         TranslationUnit *unit;
-        Scope *globals;
+        Namespace *globals;
         unsigned errorCount;
     };