diff --git a/components/codetools/tests/fdt_basic.pas b/components/codetools/tests/fdt_basic.pas
index 0e7110de7c..98d56ca727 100644
--- a/components/codetools/tests/fdt_basic.pas
+++ b/components/codetools/tests/fdt_basic.pas
@@ -13,9 +13,12 @@ type
   { TMyClass1 }
 
   TMyClass1 = class
+  private
+    function GetItems(Index: Integer): TComponent;
   public
     constructor Create{declaration:System.TObject.Create};
     procedure DefaultHandler{declaration:System.TObject.DefaultHandler}(var message); override;
+    property Items[Index: Integer]: TComponent read GetItems; default;
   end;
 
   { TMyClass2 }
@@ -29,9 +32,16 @@ implementation
 
 { TMyClass1 }
 
+function TMyClass1.GetItems(Index: Integer): TComponent;
+begin
+  if Index=0 then ;
+  Result:=nil;
+end;
+
 constructor TMyClass1{declaration:fdt_basic.TMyClass1}.Create{declaration:fdt_basic.TMyClass1.Create};
 begin
-
+  Self.Items{declaration:fdt_basic.TMyClass1.Items}[0].Name{declaration:Classes.TComponent.Name}:='';
+  Self[0].Name{declaration:Classes.TComponent.Name}:='';
 end;
 
 procedure TMyClass1.DefaultHandler(var message);
diff --git a/components/codetools/tests/fdtbase.pas b/components/codetools/tests/fdtbase.pas
index a1c5d4b196..d028c7b5b4 100644
--- a/components/codetools/tests/fdtbase.pas
+++ b/components/codetools/tests/fdtbase.pas
@@ -88,6 +88,8 @@ procedure TTestFindDeclaration.FindDeclarations(Filename: string);
         PrependPath(Tool.GetSourceName(false),Result);
       ctnProcedure:
         PrependPath(Tool.ExtractProcName(Node,[]),Result);
+      ctnProperty:
+        PrependPath(Tool.ExtractPropName(Node,false),Result);
       end;
       Node:=Node.Parent;
     end;
diff --git a/components/codetools/tests/finddeclarationtest.lpi b/components/codetools/tests/finddeclarationtest.lpi
index ec724a6341..60d7049e5a 100644
--- a/components/codetools/tests/finddeclarationtest.lpi
+++ b/components/codetools/tests/finddeclarationtest.lpi
@@ -40,7 +40,7 @@
         <PackageName Value="fpcunitconsolerunner"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="9">
+    <Units Count="10">
       <Unit0>
         <Filename Value="finddeclarationtest.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -77,6 +77,10 @@
         <Filename Value="fdt_with.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit8>
+      <Unit9>
+        <Filename Value="fpctests/tdefaultproperty1.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit9>
     </Units>
   </ProjectOptions>
   <CompilerOptions>