diff --git a/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion239987Test.java b/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion239987Test.java
new file mode 100644
--- /dev/null
+++ b/php.editor/test/unit/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion239987Test.java
@@ -0,0 +1,129 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2015 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.php.editor.completion;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.Map;
+import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.modules.php.project.api.PhpSourcePath;
+import org.netbeans.spi.java.classpath.support.ClassPathSupport;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+
+public class PHPCodeCompletion239987Test extends PHPCodeCompletionTestBase {
+
+    public PHPCodeCompletion239987Test(String testName) {
+        super(testName);
+    }
+
+    @Override
+    protected Map<String, ClassPath> createClassPathsForTest() {
+        return Collections.singletonMap(
+                PhpSourcePath.SOURCE_CP,
+                ClassPathSupport.createClassPath(new FileObject[]{
+            FileUtil.toFileObject(new File(getDataDir(), "/testfiles/completion/lib/tests239987/"))
+        })
+        );
+    }
+
+    public void testReturnTagAndStatement() throws Exception {
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$base->publicBaseMethod()->^multipleReturnStatements()->publicDelegateMethod()->publicDelegateMethod(); // test", false);
+    }
+
+    public void testOnlyReturnStatements() throws Exception {
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$base->publicBaseMethod()->multipleReturnStatements()->^publicDelegateMethod()->publicDelegateMethod(); // test", false);
+    }
+
+    public void testOnlyReturnTags() throws Exception {
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$base->multipleReturnTags()->^multipleReturnStatements(); // test", false);
+    }
+
+    public void testReturnTagsAndStatements() throws Exception {
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$base->multipleReturnTagsAndStatements()->^publicBaseVoidMethod(); // test", false);
+    }
+
+    public void testCallerDependentTypes() throws Exception {
+        // should be shown all methods of ExClass
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$exClass->publicBaseMethod()->^publicExMethod()->multipleReturnStatements()->publicDelegateMethod()->publicDelegateMethod(); // test", false);
+    }
+
+    public void testCallerDependentTypes_02() throws Exception {
+        // should be shown all public methods of ExClass, BaseClass and Delegate
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$exClass->publicBaseMethod()->publicExMethod()->multipleReturnStatements()->^publicDelegateMethod()->publicDelegateMethod(); // test", false);
+    }
+
+    public void testCallerDependentTypes_03() throws Exception {
+        // should be shown only public methods of Delegate
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$exClass->publicBaseMethod()->publicExMethod()->multipleReturnStatements()->publicDelegateMethod()->^publicDelegateMethod(); // test", false);
+    }
+
+    public void testCallerDependentTypes_04() throws Exception {
+        // should be shown all methods of ExClass, public protected methods of BaseClass and public methods of Delegate
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$this->multipleReturnStatements()->^privateExMethod()->multipleReturnStatements(); // test", false);
+    }
+
+    public void testCallerDependentTypes_05() throws Exception {
+        // should be shown all methods of ExClass, public protected methods of BaseClass and public methods of Delegate
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$this->multipleReturnTagsAndStatements()->^publicDelegateMethod()->publicDelegateMethod(); // test", false);
+    }
+
+    public void testCallerDependentTypes_06() throws Exception {
+        // should be shown only public methods of Delegate
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$this->multipleReturnTagsAndStatements()->publicDelegateMethod()->^publicDelegateMethod(); // test", false);
+    }
+
+    public void testCallerDependentTypes_07() throws Exception {
+        // should be shown all public methods of ExClass, BaseClass and Delegate
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$exClass->multipleReturnTags()->^multipleReturnStatements(); //test", false);
+    }
+
+    public void testMethodInvocationReturnType() throws Exception {
+        // should be shown all methods of ExClass and public protected methods of BaseClass
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$this->multipleReturnStatements()->privateExMethod()->^multipleReturnStatements(); // test", false);
+    }
+
+    public void testReturnTagWithOldThis() throws Exception {
+        checkCompletion("testfiles/completion/lib/tests239987/issue239987.php", "$base->returnTagWithOldThis()->^multipleReturnStatements(); // test", false);
+    }
+
+}