diff --git a/src/plugins/autotest/gtest/gtestsettingspage.ui b/src/plugins/autotest/gtest/gtestsettingspage.ui
index 4b2f998310f..40c06015dca 100644
--- a/src/plugins/autotest/gtest/gtestsettingspage.ui
+++ b/src/plugins/autotest/gtest/gtestsettingspage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>397</width>
-    <height>205</height>
+    <width>449</width>
+    <height>210</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,57 +17,44 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QCheckBox" name="runDisabledGTestsCB">
-       <property name="toolTip">
-        <string>Executes disabled tests when performing a test run.</string>
-       </property>
-       <property name="text">
-        <string>Run disabled tests</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="breakOnFailureCB">
-       <property name="toolTip">
-        <string>Turn failures into debugger breakpoints.</string>
-       </property>
-       <property name="text">
-        <string>Break on failure while debugging</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QCheckBox" name="repeatGTestsCB">
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="breakOnFailureCB">
          <property name="toolTip">
-          <string>Repeats a test run (you might be required to increase the timeout to avoid canceling the tests).</string>
+          <string>Turn failures into debugger breakpoints.</string>
          </property>
          <property name="text">
-          <string>Repeat tests</string>
+          <string>Break on failure while debugging</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+       <item row="0" column="0">
+        <widget class="QCheckBox" name="runDisabledGTestsCB">
+         <property name="toolTip">
+          <string>Executes disabled tests when performing a test run.</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
+         <property name="text">
+          <string>Run disabled tests</string>
          </property>
-        </spacer>
+        </widget>
        </item>
-       <item>
+       <item row="4" column="0">
+        <widget class="QCheckBox" name="throwOnFailureCB">
+         <property name="toolTip">
+          <string>Turn assertion failures into C++ exceptions.</string>
+         </property>
+         <property name="text">
+          <string>Throw on failure</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
         <widget class="QLabel" name="label">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -77,7 +64,27 @@
          </property>
         </widget>
        </item>
-       <item>
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="shuffleGTestsCB">
+         <property name="toolTip">
+          <string>Shuffle tests automatically on every iteration by the given seed.</string>
+         </property>
+         <property name="text">
+          <string>Shuffle tests</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QCheckBox" name="repeatGTestsCB">
+         <property name="toolTip">
+          <string>Repeats a test run (you might be required to increase the timeout to avoid canceling the tests).</string>
+         </property>
+         <property name="text">
+          <string>Repeat tests</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="2">
         <widget class="QSpinBox" name="repetitionSpin">
          <property name="enabled">
           <bool>false</bool>
@@ -90,50 +97,10 @@
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
-       <item>
-        <widget class="QCheckBox" name="shuffleGTestsCB">
-         <property name="toolTip">
-          <string>Shuffle tests automatically on every iteration by the given seed.</string>
-         </property>
-         <property name="text">
-          <string>Shuffle tests</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
+       <item row="3" column="1">
         <widget class="QLabel" name="label_2">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -143,7 +110,7 @@
          </property>
         </widget>
        </item>
-       <item>
+       <item row="3" column="2">
         <widget class="QSpinBox" name="seedSpin">
          <property name="enabled">
           <bool>false</bool>
@@ -159,31 +126,8 @@
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="horizontalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </item>
-     <item>
-      <widget class="QCheckBox" name="throwOnFailureCB">
-       <property name="toolTip">
-        <string>Turn assertion failures into C++ exceptions.</string>
-       </property>
-       <property name="text">
-        <string>Throw on failure</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
diff --git a/src/plugins/autotest/qtest/qttestsettingspage.ui b/src/plugins/autotest/qtest/qttestsettingspage.ui
index 6c5db71a30a..c45233e4154 100644
--- a/src/plugins/autotest/qtest/qttestsettingspage.ui
+++ b/src/plugins/autotest/qtest/qttestsettingspage.ui
@@ -36,9 +36,6 @@
          <property name="title">
           <string>Benchmark Metrics</string>
          </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <widget class="QRadioButton" name="walltimeRB">