diff --git a/fixtures/completion/bare_php.php b/fixtures/completion/bare_php.php
new file mode 100644
index 00000000..36b5ad94
--- /dev/null
+++ b/fixtures/completion/bare_php.php
@@ -0,0 +1,5 @@
+<?php
+
+$abc = 1;
+$abc2 = 2;
+echo $ab
diff --git a/tests/LanguageServerTest.php b/tests/LanguageServerTest.php
index 38b1fa16..c32a76a3 100644
--- a/tests/LanguageServerTest.php
+++ b/tests/LanguageServerTest.php
@@ -57,7 +57,7 @@ public function testIndexingWithDirectFileAccess()
             if ($msg->body->method === 'window/logMessage' && $promise->state === Promise::PENDING) {
                 if ($msg->body->params->type === MessageType::ERROR) {
                     $promise->reject(new Exception($msg->body->params->message));
-                } else if (strpos($msg->body->params->message, 'All 25 PHP files parsed') !== false) {
+                } else if (strpos($msg->body->params->message, 'All 26 PHP files parsed') !== false) {
                     $promise->fulfill();
                 }
             }
@@ -103,7 +103,7 @@ public function testIndexingWithFilesAndContentRequests()
                     if ($promise->state === Promise::PENDING) {
                         $promise->reject(new Exception($msg->body->params->message));
                     }
-                } else if (strpos($msg->body->params->message, 'All 25 PHP files parsed') !== false) {
+                } else if (strpos($msg->body->params->message, 'All 26 PHP files parsed') !== false) {
                     $promise->fulfill();
                 }
             }
diff --git a/tests/Server/TextDocument/CompletionTest.php b/tests/Server/TextDocument/CompletionTest.php
index 15349ed0..dd9e6804 100644
--- a/tests/Server/TextDocument/CompletionTest.php
+++ b/tests/Server/TextDocument/CompletionTest.php
@@ -433,4 +433,36 @@ public function testNamespace()
             )
         ], true), $items);
     }
+
+    public function testBarePhp()
+    {
+        $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/bare_php.php');
+        $this->loader->open($completionUri, file_get_contents($completionUri));
+        $items = $this->textDocument->completion(
+            new TextDocumentIdentifier($completionUri),
+            new Position(4, 8)
+        )->wait();
+        $this->assertEquals(new CompletionList([
+            new CompletionItem(
+                '$abc2',
+                CompletionItemKind::VARIABLE,
+                'int',
+                null,
+                null,
+                null,
+                null,
+                new TextEdit(new Range(new Position(4, 8), new Position(4, 8)), 'c2')
+            ),
+            new CompletionItem(
+                '$abc',
+                CompletionItemKind::VARIABLE,
+                'int',
+                null,
+                null,
+                null,
+                null,
+                new TextEdit(new Range(new Position(4, 8), new Position(4, 8)), 'c')
+            )
+        ], true), $items);
+    }
 }