diff --git a/duchain/tests/duchain_multiplefiles.cpp b/duchain/tests/duchain_multiplefiles.cpp
--- a/duchain/tests/duchain_multiplefiles.cpp
+++ b/duchain/tests/duchain_multiplefiles.cpp
@@ -80,10 +80,9 @@
     f2.parse(features);
 
     TestFile f1(QStringLiteral("<? class A {}"), QStringLiteral("php"), project);
-    f1.parse(features, 100); //low priority, to make sure f2 is parsed first
+    f1.parseAndWait(features, 100, 2000); //low priority, to make sure f2 is parsed first
 
-    QVERIFY(f1.waitForParsed());
-    QTest::qWait(100);
+    QVERIFY(f1.isReady());
 
     DUChainWriteLocker lock(DUChain::lock());
     QVERIFY(f2.topContext()->imports(f1.topContext(), CursorInRevision(0, 0)));
@@ -118,14 +117,12 @@
     f2.parse(features);
 
     TestFile f1(QStringLiteral("<? function foo2() {}"), QStringLiteral("php"), project);
-    f1.parse(features, 100); //low priority, to make sure f2 is parsed first
+    f1.parseAndWait(features, 100, 2000); //low priority, to make sure f2 is parsed first
 
-    QVERIFY(f2.waitForParsed());
-    QTest::qWait(100);
+    QVERIFY(f1.isReady());
 
     DUChainWriteLocker lock(DUChain::lock());
     QVERIFY(f2.topContext()->imports(f1.topContext(), CursorInRevision(0, 0)));
-
 }
 
 void TestDUChainMultipleFiles::testNonExistingGlobalFunction()
@@ -156,10 +153,9 @@
     f2.parse(features);
 
     TestFile f1(QStringLiteral("<? class C { public static function foo() {} }"), QStringLiteral("php"), project);
-    f1.parse(features, 100); //low priority, to make sure f2 is parsed first
+    f1.parseAndWait(features, 100, 2000); //low priority, to make sure f2 is parsed first
 
-    QVERIFY(f2.waitForParsed());
-    QTest::qWait(100);
+    QVERIFY(f1.isReady());
 
     DUChainWriteLocker lock(DUChain::lock());
     QVERIFY(f2.topContext()->imports(f1.topContext(), CursorInRevision(0, 0)));
diff --git a/phpparsejob.cpp b/phpparsejob.cpp
--- a/phpparsejob.cpp
+++ b/phpparsejob.cpp
@@ -153,7 +153,7 @@
         }
 
         if (hadUnresolvedIdentifiers) {
-            if (!(minimumFeatures() & Resheduled) && KDevelop::ICore::self()->languageController()->backgroundParser()->queuedCount()) {
+            if (!(minimumFeatures() & Resheduled)) {
                 // Need to create new parse job with lower priority
                 qCDebug(PHP) << "Reschedule file " << document().str() << "for parsing";
                 KDevelop::TopDUContext::Features feat = static_cast<KDevelop::TopDUContext::Features>(