diff --git a/date_repeat/tests/date_repeat_form.test b/date_repeat/tests/date_repeat_form.test
index 22d6529..c725380
--- a/date_repeat/tests/date_repeat_form.test
+++ b/date_repeat/tests/date_repeat_form.test
@@ -456,7 +456,7 @@ class DateRepeatFormTestCase extends DrupalWebTestCase {
     $edit = array();
     $edit['fields[_add_new_field][label]'] = 'Test';
     $edit['fields[_add_new_field][field_name]'] = 'test';
-    $edit['fields[_add_new_field][weight]'] = '-4';
+    $edit['fields[_add_new_field][weight]'] = '-100';
     $edit['fields[_add_new_field][type]'] = $type;
     $edit['fields[_add_new_field][widget_type]'] = $widget;
 
diff --git a/date_tools/date_tools.wizard.inc b/date_tools/date_tools.wizard.inc
index 94a130a..3e9a638
--- a/date_tools/date_tools.wizard.inc
+++ b/date_tools/date_tools.wizard.inc
@@ -112,6 +112,12 @@ function date_tools_wizard_form() {
     '#title' => t('Date timezone handling'),
     '#description' => t("Timezone handling should be set to 'none' for granularity without time elements."),
   );
+  $form['field']['advanced']['weight'] = array(
+    '#type' => 'textfield',
+    '#default_value' => '-4',
+    '#title' => t('Weight'),
+    '#description' => t("Set the field weight."),
+  );
   $form['calendar'] = array(
     '#type' => 'select',
     '#default_value' => module_exists('calendar'),
@@ -238,7 +244,7 @@ function date_tools_wizard_build($form_values) {
     'label' => $label,
     'bundle' => $bundle,
     // Move the date right below the title.
-    'weight' => -4,
+    'weight' => $weight,
     'widget' => array(
       'type' => $widget_type,
       // Increment for minutes and seconds, can be 1, 5, 10, 15, or 30.
@@ -252,7 +258,7 @@ function date_tools_wizard_build($form_values) {
         'label_position' => 'above',
         'repeat_collapsed' => 0,
       ),
-      'weight' => -4,
+      'weight' => $weight,
     ),
     'settings' => array(
       'default_value' => 'now',
diff --git a/date_tools/tests/date_tools.test b/date_tools/tests/date_tools.test
index 07af4a3..0c35147
--- a/date_tools/tests/date_tools.test
+++ b/date_tools/tests/date_tools.test
@@ -97,6 +97,7 @@ class DateToolsTestCase extends DrupalWebTestCase {
       'granularity[]' => array('year', 'month', 'day', 'hour', 'minute'),
       'tz_handling' => 'site',
       'year_range' => '2010:+2',
+      'weight' => -100,
     );
     $this->drupalPost('admin/config/date/tools/date_wizard', $edit, t('Save'));
     $this->assertText('Your date field Test has been created.', 'Create a date field using the Date Wizard.');
diff --git a/tests/date_field.test b/tests/date_field.test
index b8aad59..1e687d8
--- a/tests/date_field.test
+++ b/tests/date_field.test
@@ -84,8 +84,8 @@ abstract class DateFieldBasic extends DrupalWebTestCase {
       'field_name' => $field_name,
       'label' => $label,
       'bundle' => $bundle,
-      // Move the date right below the title.
-      'weight' => -4,
+      // Move the date to the top.
+      'weight' => -100,
       'widget' => array(
         'type' => $widget_type,
         // Increment for minutes and seconds, can be 1, 5, 10, 15, or 30.
@@ -100,7 +100,7 @@ abstract class DateFieldBasic extends DrupalWebTestCase {
           'label_position' => 'above',
           'repeat_collapsed' => 0,
         ),
-        'weight' => -4,
+        'weight' => -100,
       ),
       'settings' => array(
         'default_value' => $default_value,
@@ -202,8 +202,8 @@ abstract class DateFieldBasic extends DrupalWebTestCase {
       'field_name' => $field_name,
       'label' => $label,
       'bundle' => $bundle,
-      // Move the date right below the title.
-      'weight' => -4,
+      // Move the date to the top.
+      'weight' => -100,
       'widget' => array(
         'type' => $widget_type,
         // Increment for minutes and seconds, can be 1, 5, 10, 15, or 30.
@@ -218,7 +218,7 @@ abstract class DateFieldBasic extends DrupalWebTestCase {
           'label_position' => 'above',
           'repeat_collapsed' => 0,
         ),
-        'weight' => -4,
+        'weight' => -100,
       ),
       'settings' => array(
         'default_value' => $default_value,