diff --git a/duchain/tests/duchain.cpp b/duchain/tests/duchain.cpp
--- a/duchain/tests/duchain.cpp
+++ b/duchain/tests/duchain.cpp
@@ -1567,10 +1567,10 @@
 
     code.prepend("<?php ");
 
+    DUChainWriteLocker lock;
     TopDUContext* top = parse(code.toUtf8(), DumpNone);
     QVERIFY(top);
     DUChainReleaser releaseTop(top);
-    DUChainWriteLocker lock;
 
     QCOMPARE(top->problems().count(), problems);
 
@@ -3184,6 +3184,8 @@
 
 void TestDUChain::useNamespace()
 {
+    DUChainWriteLocker lock;
+
     //               0         1         2         3         4         5         6         7
     //               01234567890123456789012345678901234567890123456789012345678901234567890123456789
     TopDUContext* top = parse("<?php\n"
@@ -3204,7 +3206,6 @@
                               , DumpNone);
     QVERIFY(top);
     DUChainReleaser releaseTop(top);
-    DUChainWriteLocker lock;
 
     QCOMPARE(top->localDeclarations().count(), 5);
 
@@ -3225,6 +3226,8 @@
 
 void TestDUChain::useBaseTypeNamespace()
 {
+    DUChainWriteLocker lock;
+
     //               0         1         2         3         4         5         6         7
     //               01234567890123456789012345678901234567890123456789012345678901234567890123456789
     TopDUContext* top = parse("<?php\n"
@@ -3244,7 +3247,6 @@
                               , DumpNone);
     QVERIFY(top);
     DUChainReleaser releaseTop(top);
-    DUChainWriteLocker lock;
 
     QCOMPARE(top->localDeclarations().count(), 4);
 
@@ -3259,6 +3261,8 @@
 
 void TestDUChain::useNamespaceBaseTypeAlias()
 {
+    DUChainWriteLocker lock(DUChain::lock());
+
     //               0         1         2         3         4         5         6         7
     //               01234567890123456789012345678901234567890123456789012345678901234567890123456789
     TopDUContext* top = parse("<?php\n"
@@ -3278,7 +3282,6 @@
                               , DumpNone);
     QVERIFY(top);
     DUChainReleaser releaseTop(top);
-    DUChainWriteLocker lock(DUChain::lock());
 
     QCOMPARE(top->problems().count(), 2);
 }
@@ -3378,12 +3381,13 @@
     QFETCH(QString, code);
     QFETCH(QList<TestUse>, usesMap);
 
+    DUChainWriteLocker lock;
+
     TopDUContext* top = parse(code.toLocal8Bit(), DumpAll);
 
     QVERIFY(top);
 
     DUChainReleaser releaseTop(top);
-    DUChainWriteLocker lock;
 
     foreach ( const TestUse& use, usesMap ) {
         QList< Declaration* > decs = top->findDeclarations(use.id);
diff --git a/duchain/tests/uses.cpp b/duchain/tests/uses.cpp
--- a/duchain/tests/uses.cpp
+++ b/duchain/tests/uses.cpp
@@ -921,6 +921,8 @@
 
 void TestUses::namespaces()
 {
+    DUChainWriteLocker lock;
+
     //                         0         1         2         3         4         5         6         7
     //                         01234567890123456789012345678901234567890123456789012345678901234567890123456789
     TopDUContext* top = parse("<?php\n"
@@ -943,7 +945,6 @@
                               "}\n", DumpAll);
     QVERIFY(top);
     DUChainReleaser releaseTop(top);
-    DUChainWriteLocker lock;
 
     Declaration* dec;
 
@@ -997,6 +998,8 @@
 
 void TestUses::useNamespace()
 {
+    DUChainWriteLocker lock;
+
     //                         0         1         2         3         4         5         6         7
     //                         01234567890123456789012345678901234567890123456789012345678901234567890123456789
     TopDUContext* top = parse("<?php\n"
@@ -1012,7 +1015,6 @@
                               "}\n", DumpNone);
     QVERIFY(top);
     DUChainReleaser releaseTop(top);
-    DUChainWriteLocker lock;
 
     Declaration* dec;
     dec = top->findDeclarations(QualifiedIdentifier(QStringLiteral("foo"))).first();