diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2425f21df..e3ae1fcad 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -39,6 +39,8 @@
             <directory suffix=".php">./src/Psalm/Stubs/</directory>
             <file>./src/Psalm/CallMap.php</file>
             <file>./src/psalm.php</file>
+            <file>./src/Psalm/Provider/Cache/NoParserCacheProvider.php</file>
+            <file>./src/Psalm/Provider/ParserCacheProvider.php</file>
             <file>./src/Psalm/PropertyMap.php</file>
             <directory suffix=".php">./src/Psalm/Issue/</directory>
         </exclude>
diff --git a/tests/PropertyTypeTest.php b/tests/PropertyTypeTest.php
index 55e2caa5f..196d8d52b 100644
--- a/tests/PropertyTypeTest.php
+++ b/tests/PropertyTypeTest.php
@@ -611,6 +611,38 @@ class PropertyTypeTest extends TestCase
                         public function __construct() { }
                     }',
             ],
+            'analyzePropertyMappedClass' => [
+                '<?php
+                    namespace PhpParser\Node\Stmt;
+
+                    use PhpParser\Node;
+
+                    class Finally_ extends Node\Stmt
+                    {
+                        /** @var Node[] Statements */
+                        public $stmts;
+
+                        /**
+                         * Constructs a finally node.
+                         *
+                         * @param Node[] $stmts      Statements
+                         * @param array  $attributes Additional attributes
+                         */
+                        public function __construct(array $stmts = array(), array $attributes = array()) {
+                            parent::__construct($attributes);
+                            $this->stmts = $stmts;
+                        }
+
+                        public function getSubNodeNames() {
+                            return array("stmts");
+                        }
+                    }',
+                'assertions' => [],
+                'error_levels' => [
+                    'InvalidPropertyAssignment',
+                    'MissingReturnType',
+                ],
+            ],
         ];
     }