diff --git a/components/fpcunit/ide/testcaseopts.lfm b/components/fpcunit/ide/testcaseopts.lfm
index c3d7db74e5..2d096f68e5 100644
--- a/components/fpcunit/ide/testcaseopts.lfm
+++ b/components/fpcunit/ide/testcaseopts.lfm
@@ -1,90 +1,120 @@
 object TestCaseOptionsForm: TTestCaseOptionsForm
-  Left = 1218
-  Height = 243
-  Top = 523
-  Width = 266
+  Left = 607
+  Height = 245
+  Top = 370
+  Width = 284
   HorzScrollBar.Page = 265
   VertScrollBar.Page = 247
-  BorderStyle = bsDialog
+  BorderIcons = [biSystemMenu]
   Caption = 'TestCase Options'
-  ClientHeight = 243
-  ClientWidth = 266
+  ClientHeight = 245
+  ClientWidth = 284
+  Constraints.MinHeight = 240
+  Constraints.MinWidth = 280
   OnCreate = FormCreate
   Position = poScreenCenter
   LCLVersion = '0.9.29'
   object gbNames: TGroupBox
-    Left = 0
-    Height = 89
-    Top = 0
-    Width = 266
+    Left = 6
+    Height = 77
+    Top = 6
+    Width = 272
     Align = alTop
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Names'
-    ClientHeight = 67
-    ClientWidth = 262
+    ClientHeight = 59
+    ClientWidth = 268
     TabOrder = 0
     object Label1: TLabel
-      Left = 16
-      Height = 18
-      Top = 9
-      Width = 113
+      AnchorSideLeft.Control = edDefaultName
+      AnchorSideTop.Control = gbNames
+      Left = 6
+      Height = 14
+      Top = 12
+      Width = 90
+      BorderSpacing.Top = 12
       Caption = 'Default Test Name'
       FocusControl = edDefaultName
       ParentColor = False
     end
     object edDefaultName: TEdit
-      Left = 16
-      Height = 25
-      Top = 25
-      Width = 232
+      AnchorSideLeft.Control = gbNames
+      AnchorSideTop.Control = Label1
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = gbNames
+      AnchorSideRight.Side = asrBottom
+      Left = 6
+      Height = 21
+      Top = 26
+      Width = 256
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 6
+      BorderSpacing.Right = 6
+      BorderSpacing.Bottom = 12
       MaxLength = 30
       TabOrder = 0
       Text = 'TTestCase1'
     end
   end
-  object Panel1: TPanel
-    Left = 0
-    Height = 42
-    Top = 201
-    Width = 266
-    Align = alBottom
-    BevelOuter = bvNone
-    ClientHeight = 42
-    ClientWidth = 266
-    FullRepaint = False
-    TabOrder = 1
-    object btnAccept: TButton
-      Left = 64
-      Height = 25
-      Top = 10
-      Width = 120
-      Caption = 'Create unit'
-      OnClick = btnAcceptClick
-      TabOrder = 0
-    end
+  object btnAccept: TButton
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Side = asrCenter
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 102
+    Height = 23
+    Top = 216
+    Width = 80
+    Anchors = [akLeft, akBottom]
+    AutoSize = True
+    BorderSpacing.Bottom = 6
+    Caption = 'Create unit'
+    OnClick = btnAcceptClick
+    TabOrder = 2
   end
   object gbFixture: TGroupBox
-    Left = 0
-    Height = 112
+    AnchorSideTop.Control = gbNames
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = btnAccept
+    Left = 6
+    Height = 121
     Top = 89
-    Width = 266
-    Align = alClient
+    Width = 272
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Fixture'
-    ClientHeight = 90
-    ClientWidth = 262
-    TabOrder = 2
+    ClientHeight = 103
+    ClientWidth = 268
+    TabOrder = 1
     object cbSetup: TCheckBox
-      Left = 22
-      Height = 21
-      Top = 11
-      Width = 152
+      AnchorSideLeft.Control = gbFixture
+      AnchorSideTop.Control = gbFixture
+      Left = 6
+      Height = 17
+      Top = 12
+      Width = 121
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 12
       Caption = 'Create Setup Method'
       TabOrder = 0
     end
     object cbTeardown: TCheckBox
-      Left = 22
-      Height = 21
-      Top = 59
-      Width = 181
+      AnchorSideLeft.Control = gbFixture
+      AnchorSideTop.Control = cbSetup
+      AnchorSideTop.Side = asrBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 6
+      Height = 17
+      Top = 41
+      Width = 142
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 12
+      BorderSpacing.Bottom = 12
       Caption = 'Create TearDown method'
       TabOrder = 1
     end
diff --git a/components/fpcunit/ide/testcaseopts.pas b/components/fpcunit/ide/testcaseopts.pas
index 2b59681878..6f307a940f 100644
--- a/components/fpcunit/ide/testcaseopts.pas
+++ b/components/fpcunit/ide/testcaseopts.pas
@@ -17,10 +17,9 @@ type
     cbSetup: TCheckBox;
     cbTeardown: TCheckBox;
     edDefaultName: TEdit;
-    gbNames: TGroupBox;
     gbFixture: TGroupBox;
+    gbNames: TGroupBox;
     Label1: TLabel;
-    Panel1: TPanel;
     procedure btnAcceptClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
   private
@@ -43,7 +42,6 @@ end;
 
 procedure TTestCaseOptionsForm.FormCreate(Sender: TObject);
 begin
-  //
   Caption := sfrmTest;
   gbNames.Caption:= sgrpNames;
   gbFixture.Caption:= sgrpFixture;