diff --git a/test/customdrawn/cd_test_all.lpi b/test/customdrawn/cd_test_all.lpi
index 52ae518755..572932997f 100644
--- a/test/customdrawn/cd_test_all.lpi
+++ b/test/customdrawn/cd_test_all.lpi
@@ -26,6 +26,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
+        <LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="2">
@@ -52,7 +53,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <Target>
       <Filename Value="cd_test_all"/>
     </Target>
@@ -61,10 +62,6 @@
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
-      <Debugging>
-        <GenerateDebugInfo Value="True"/>
-        <DebugInfoType Value="dsAuto"/>
-      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
@@ -72,6 +69,9 @@
       </Options>
     </Linking>
     <Other>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
diff --git a/test/customdrawn/cd_test_all.lpr b/test/customdrawn/cd_test_all.lpr
index 32305ee791..46de7df8f9 100644
--- a/test/customdrawn/cd_test_all.lpr
+++ b/test/customdrawn/cd_test_all.lpr
@@ -16,6 +16,7 @@ uses
 begin
   RequireDerivedFormResource := True;
   Application.Initialize;
+  Application.CreateForm(TForm1, Form1);
   Application.Run;
 end.
 
diff --git a/test/customdrawn/mainform.lfm b/test/customdrawn/mainform.lfm
index 701ec41d99..892752e97a 100644
--- a/test/customdrawn/mainform.lfm
+++ b/test/customdrawn/mainform.lfm
@@ -9,7 +9,7 @@ object Form1: TForm1
   LCLVersion = '0.9.31'
   object comboControls: TComboBox
     Left = 72
-    Height = 21
+    Height = 27
     Top = 12
     Width = 172
     ItemHeight = 0
@@ -21,6 +21,7 @@ object Form1: TForm1
       'TCDGroupBox'
       'TCDCustomTabControl'
     )
+    OnChange = comboControlsChange
     TabOrder = 0
     Text = 'TCDButton'
   end
@@ -37,16 +38,71 @@ object Form1: TForm1
     Height = 240
     Top = 40
     Width = 439
+    PageIndex = 1
     TabOrder = 2
     TabStop = True
-  end
-  object Button1: TButton
-    Left = 24
-    Height = 25
-    Top = 55
-    Width = 75
-    Caption = 'TButton'
-    TabOrder = 3
+    object Page1: TPage
+      ClientWidth = 439
+      ClientHeight = 240
+      object CDButton1: TCDButton
+        Left = 119
+        Height = 25
+        Top = 16
+        Width = 75
+        Caption = 'CDButton1'
+        Color = 15857141
+        DrawStyle = dsDefault
+        TabOrder = 0
+        TabStop = True
+      end
+      object CDButton2: TCDButton
+        Left = 119
+        Height = 25
+        Top = 50
+        Width = 75
+        Caption = 'CDButton2'
+        Color = 15857141
+        DrawStyle = dsDefault
+        TabOrder = 1
+        TabStop = True
+      end
+      object Button1: TButton
+        Left = 7
+        Height = 25
+        Top = 16
+        Width = 75
+        Caption = 'TButton'
+        TabOrder = 2
+      end
+    end
+    object Page2: TPage
+      ClientWidth = 439
+      ClientHeight = 240
+      object CDEdit1: TCDEdit
+        Left = 103
+        Height = 30
+        Top = 24
+        Width = 100
+      end
+      object Edit1: TEdit
+        Left = 8
+        Height = 25
+        Top = 28
+        Width = 80
+        TabOrder = 1
+        Text = 'Edit1'
+      end
+    end
+    object Page3: TPage
+    end
+    object Page4: TPage
+    end
+    object Page5: TPage
+    end
+    object Page6: TPage
+    end
+    object Page7: TPage
+    end
   end
   object Memo1: TMemo
     Left = 9
@@ -56,7 +112,7 @@ object Form1: TForm1
     Lines.Strings = (
       'Memo1'
     )
-    TabOrder = 4
+    TabOrder = 3
   end
   object StaticText2: TStaticText
     Left = 7
@@ -64,6 +120,6 @@ object Form1: TForm1
     Top = 281
     Width = 65
     Caption = 'Events:'
-    TabOrder = 5
+    TabOrder = 4
   end
 end
diff --git a/test/customdrawn/mainform.pas b/test/customdrawn/mainform.pas
index f3dc393566..1ba4c73d5b 100644
--- a/test/customdrawn/mainform.pas
+++ b/test/customdrawn/mainform.pas
@@ -14,11 +14,23 @@ type
 
   TForm1 = class(TForm)
     Button1: TButton;
+    CDButton1: TCDButton;
+    CDButton2: TCDButton;
+    CDEdit1: TCDEdit;
     comboControls: TComboBox;
+    Edit1: TEdit;
     Memo1: TMemo;
     notebookControls: TNotebook;
+    Page1: TPage;
+    Page2: TPage;
+    Page3: TPage;
+    Page4: TPage;
+    Page5: TPage;
+    Page6: TPage;
+    Page7: TPage;
     StaticText1: TStaticText;
     StaticText2: TStaticText;
+    procedure comboControlsChange(Sender: TObject);
   private
     { private declarations }
   public
@@ -32,5 +44,12 @@ implementation
 
 {$R *.lfm}
 
+{ TForm1 }
+
+procedure TForm1.comboControlsChange(Sender: TObject);
+begin
+  notebookControls.PageIndex := comboControls.ItemIndex;
+end;
+
 end.