diff --git a/ext/reflection/tests/bug36308.phpt b/ext/reflection/tests/bug36308.phpt
new file mode 100755
index 00000000000..0b0346a137d
--- /dev/null
+++ b/ext/reflection/tests/bug36308.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #36308 (ReflectionProperty::getDocComment() does not reflect extended class commentary)
+--FILE--
+<?php
+class Base {
+    /** Base comment block */
+    public $foo = 'bar';
+}
+
+class Extended extends Base {
+    /** Extended commentary */
+    public $foo = 'zim';
+}
+
+$reflect = new ReflectionClass('Extended');
+$props = $reflect->getProperties();
+echo $props[0]->getDocComment();
+?>
+--EXPECT--
+/** Extended commentary */
\ No newline at end of file