diff -u b/core/modules/user/user.install b/core/modules/user/user.install
--- b/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -402,21 +402,19 @@
  * Migrate user pictures to Field API.
  */
 function user_update_8003() {
-  $results = db_select('users', 'u')
-    ->fields('u', array('uid', 'picture'))
-    ->condition('picture', 0, '>')
-    ->execute()
-    ->fetchAllKeyed();
+  // @todo Chunk into 20 per batch pass.
+  $results = db_query('SELECT uid, picture FROM {users} WHERE picture > 0')->fetchAllKeyed();
   if ($uids = array_keys($results)) {
-    // XXX: $edit is dead.
+    // @todo Must not use API functions invoking hooks.
     $accounts = user_load_multiple($uids);
     foreach ($results as $uid => $fid) {
       if ($file = file_load($fid)) {
-        $edit['field_user_picture'][LANGUAGE_NONE][0] = (array) $file;
-        user_save($accounts[$uid], $edit);
+        $accounts[$uid]->field_user_picture[LANGUAGE_NONE][0] = (array) $file;
+        $accounts[$uid]->save();
       }
     }
   }
+  db_drop_field('users', 'picture');
 }
 
 /**
diff -u b/core/modules/user/user.module b/core/modules/user/user.module
--- b/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -199,7 +199,7 @@
 }
 
 /**
- * Populate $entity->account for each prepared entity.
+ * Populates $entity->account for each prepared entity.
  *
  * Called by hook_entity_prepare_view() implementations.
  *
@@ -430,28 +430,6 @@
 }
 
 /**
- * Validates a user's email address.
- *
- * Checks that a user's email address exists and follows all standard
- * validation rules. Returns error messages when the address is invalid.
- *
- * @param $mail
- *   A user's email address.
- *
- * @return
- *   If the address is invalid, a human-readable error message is returned.
- *   If the address is valid, nothing is returned.
- */
-function user_validate_mail($mail) {
-  if (!$mail) {
-    return t('You must enter an e-mail address.');
-  }
-  if (!valid_email_address($mail)) {
-    return t('The e-mail address %mail is not valid.', array('%mail' => $mail));
-  }
-}
-
-/**
  * Generate a random alphanumeric password.
  */
 function user_password($length = 10) {
@@ -675,10 +653,6 @@
  * Implements hook_user_view().
  */
 function user_user_view($account) {
-  $account->content['user_picture'] = array(
-    '#markup' => theme('user_picture', array('account' => $account)),
-    '#weight' => -10,
-  );
   $account->content['member_for'] = array(
     '#type' => 'item',
     '#title' => t('Member for'),
@@ -3306,9 +3280,8 @@
 /**
  * Implements hook_node_load().
  *
- * XXX: Not sure what this added comment means:
- * @todo: Deprecated by node_entity_prepare_view(). Update code that depends on
- * these properties.
+ * @todo Deprecated by node_entity_prepare_view(). Update code that depends on
+ *   these properties.
  */
 function user_node_load($nodes, $types) {
   // Build an array of all uids for node authors, keyed by nid.
diff -u b/core/modules/user/user.test b/core/modules/user/user.test
--- b/core/modules/user/user.test
+++ b/core/modules/user/user.test
@@ -257,50 +257,6 @@
   }
 }
 
-/**
- * Tests embedded users on entities.
- */
-class UserAttachTestCase extends DrupalWebTestCase {
-  protected $profile = 'standard';
-
-  public static function getInfo() {
-    return array(
-      'name' => 'Embedded user on node page',
-      'description' => 'Verify that author details are shown on node and comment render.',
-      'group' => 'User',
-    );
-  }
-
-  /**
-   * Tests embedded users on node pages.
-   */
-  function testUserViewOnNodePage() {
-    $this->user = $this->drupalCreateUser();
-    $this->drupalLogin($this->user);
-    $edit = array(
-      'mail' => $this->user->mail,
-    );
-    $test_image = current($this->drupalGetTestFiles('image'));
-    $edit['files[field_user_picture_' . LANGUAGE_NOT_SPECIFIED . '_0]'] = drupal_realpath($test_image->uri);
-    $this->drupalPost('user/' . $this->user->uid . '/edit', $edit, t('Save'));
-
-    $node = $this->drupalCreateNode(array('type' => 'article'));
-    // Set display preferences so pictures are enabled for this content type.
-    variable_set('theme_settings', array('toggle_node_user_picture' => TRUE));
-    variable_set('node_submitted_' . $node->type, TRUE);
-    $this->drupalGet('node/' . $node->nid);
-    $this->assertRaw('field-name-field-user-picture', 'User picture is shown on node render.');
-
-    // Disable picture for nodes and enable for comments.
-    variable_set('theme_settings', array('toggle_comment_user_picture' => TRUE));
-
-    $edit = array();
-    $edit['comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]'] = $this->randomString();
-    $this->drupalPost(NULL, $edit, t('Save'));
-    $this->assertRaw('field-name-field-user-picture', 'User picture is shown on comment render.');
-  }
-}
-
 class UserValidationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
@@ -962,13 +918,15 @@
   }
 }
 
+/**
+ * Tests user picture functionality.
+ *
+ * @todo Test public and private methods?
+ */
 class UserPictureTestCase extends DrupalWebTestCase {
-  protected $user;
-  protected $_directory_test;
-
   public static function getInfo() {
     return array(
-      'name' => 'Upload user picture',
+      'name' => 'User picture',
       'description' => 'Assure that dimension check, extension check and image scaling work as designed.',
       'group' => 'User'
     );
@@ -976,212 +934,28 @@
 
   function setUp() {
     parent::setUp(array('image'));
-    // Enable user pictures.
-    variable_set('user_pictures', 1);
 
-    // Configure default user picture settings.
-    variable_set('user_picture_dimensions', '1024x1024');
-    variable_set('user_picture_file_size', '800');
-    variable_set('user_picture_style', 'thumbnail');
+    // @see standard.install
+    module_load_install('user');
+    user_create_picture_field();
+
+    // Remove 'summary' pseudo-field from compact view mode on the User entity.
+    $bundle_settings = field_bundle_settings('user', 'user');
+    $bundle_settings['extra_fields']['display']['member_for']['compact'] = array(
+      'visible' => FALSE,
+      'weight' => 10,
+    );
+    field_bundle_settings('user', 'user', $bundle_settings);
 
     $this->user = $this->drupalCreateUser();
-
-    // Test if directories specified in settings exist in filesystem.
-    $file_dir = 'public://';
-    $file_check = file_prepare_directory($file_dir, FILE_CREATE_DIRECTORY);
-    // TODO: Test public and private methods?
-
-    $picture_dir = variable_get('user_picture_path', 'pictures');
-    $picture_path = $file_dir . $picture_dir;
-
-    $pic_check = file_prepare_directory($picture_path, FILE_CREATE_DIRECTORY);
-    $this->_directory_test = is_writable($picture_path);
-    $this->assertTrue($this->_directory_test, "The directory $picture_path doesn't exist or is not writable. Further tests won't be made.");
-  }
-
-  function testNoPicture() {
-    $this->drupalLogin($this->user);
-
-    // Try to upload a file that is not an image for the user picture.
-    $not_an_image = current($this->drupalGetTestFiles('html'));
-    $this->saveUserPicture($not_an_image);
-    $this->assertRaw(t('Only JPEG, PNG and GIF images are allowed.'), t('Non-image files are not accepted.'));
-  }
-
-  /**
-   * Do the test:
-   *  GD Toolkit is installed
-   *  Picture has invalid dimension
-   *
-   * results: The image should be uploaded because ImageGDToolkit resizes the picture
-   */
-  function testWithGDinvalidDimension() {
-    if ($this->_directory_test && image_get_toolkit()) {
-      $this->drupalLogin($this->user);
-
-      $image = current($this->drupalGetTestFiles('image'));
-      $info = image_get_info($image->uri);
-
-      // Set new variables: invalid dimensions, valid filesize (0 = no limit).
-      $test_dim = ($info['width'] - 10) . 'x' . ($info['height'] - 10);
-      variable_set('user_picture_dimensions', $test_dim);
-      variable_set('user_picture_file_size', 0);
-
-      $pic_path = $this->saveUserPicture($image);
-      // Check that the image was resized and is being displayed on the
-      // user's profile page.
-      $text = t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', array('%dimensions' => $test_dim));
-      $this->assertRaw($text, t('Image was resized.'));
-      $alt = t("@user's picture", array('@user' => user_format_name($this->user)));
-      $style = variable_get('user_picture_style', '');
-      $this->assertRaw(image_style_url($style, $pic_path), t("Image is displayed in user's edit page"));
-
-      // Check if file is located in proper directory.
-      $this->assertTrue(is_file($pic_path), t("File is located in proper directory"));
-    }
-  }
-
-  /**
-   * Do the test:
-   *  GD Toolkit is installed
-   *  Picture has invalid size
-   *
-   * results: The image should be uploaded because ImageGDToolkit resizes the picture
-   */
-  function testWithGDinvalidSize() {
-    if ($this->_directory_test && image_get_toolkit()) {
-      $this->drupalLogin($this->user);
-
-      // Images are sorted first by size then by name. We need an image
-      // bigger than 1 KB so we'll grab the last one.
-      $files = $this->drupalGetTestFiles('image');
-      $image = end($files);
-      $info = image_get_info($image->uri);
-
-      // Set new variables: valid dimensions, invalid filesize.
-      $test_dim = ($info['width'] + 10) . 'x' . ($info['height'] + 10);
-      $test_size = 1;
-      variable_set('user_picture_dimensions', $test_dim);
-      variable_set('user_picture_file_size', $test_size);
-
-      $pic_path = $this->saveUserPicture($image);
-
-      // Test that the upload failed and that the correct reason was cited.
-      $text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
-      $this->assertRaw($text, t('Upload failed.'));
-      $text = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size(filesize($image->uri)), '%maxsize' => format_size($test_size * 1024)));
-      $this->assertRaw($text, t('File size cited as reason for failure.'));
-
-      // Check if file is not uploaded.
-      $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
-    }
-  }
-
-  /**
-   * Do the test:
-   *  GD Toolkit is not installed
-   *  Picture has invalid size
-   *
-   * results: The image shouldn't be uploaded
-   */
-  function testWithoutGDinvalidDimension() {
-    if ($this->_directory_test && !image_get_toolkit()) {
-      $this->drupalLogin($this->user);
-
-      $image = current($this->drupalGetTestFiles('image'));
-      $info = image_get_info($image->uri);
-
-      // Set new variables: invalid dimensions, valid filesize (0 = no limit).
-      $test_dim = ($info['width'] - 10) . 'x' . ($info['height'] - 10);
-      variable_set('user_picture_dimensions', $test_dim);
-      variable_set('user_picture_file_size', 0);
-
-      $pic_path = $this->saveUserPicture($image);
-
-      // Test that the upload failed and that the correct reason was cited.
-      $text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
-      $this->assertRaw($text, t('Upload failed.'));
-      $text = t('The image is too large; the maximum dimensions are %dimensions pixels.', array('%dimensions' => $test_dim));
-      $this->assertRaw($text, t('Checking response on invalid image (dimensions).'));
-
-      // Check if file is not uploaded.
-      $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
-    }
-  }
-
-  /**
-   * Do the test:
-   *  GD Toolkit is not installed
-   *  Picture has invalid size
-   *
-   * results: The image shouldn't be uploaded
-   */
-  function testWithoutGDinvalidSize() {
-    if ($this->_directory_test && !image_get_toolkit()) {
-      $this->drupalLogin($this->user);
-
-      $image = current($this->drupalGetTestFiles('image'));
-      $info = image_get_info($image->uri);
-
-      // Set new variables: valid dimensions, invalid filesize.
-      $test_dim = ($info['width'] + 10) . 'x' . ($info['height'] + 10);
-      $test_size = 1;
-      variable_set('user_picture_dimensions', $test_dim);
-      variable_set('user_picture_file_size', $test_size);
-
-      $pic_path = $this->saveUserPicture($image);
-
-      // Test that the upload failed and that the correct reason was cited.
-      $text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
-      $this->assertRaw($text, t('Upload failed.'));
-      $text = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size(filesize($image->uri)), '%maxsize' => format_size($test_size * 1024)));
-      $this->assertRaw($text, t('File size cited as reason for failure.'));
-
-      // Check if file is not uploaded.
-      $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
-    }
-  }
-
-  /**
-   * Do the test:
-   *  Picture is valid (proper size and dimension)
-   *
-   * results: The image should be uploaded
-   */
-  function testPictureIsValid() {
-    if ($this->_directory_test) {
-      $this->drupalLogin($this->user);
-
-      $image = current($this->drupalGetTestFiles('image'));
-      $info = image_get_info($image->uri);
-
-      // Set new variables: valid dimensions, valid filesize (0 = no limit).
-      $test_dim = ($info['width'] + 10) . 'x' . ($info['height'] + 10);
-      variable_set('user_picture_dimensions', $test_dim);
-      variable_set('user_picture_file_size', 0);
-
-      $pic_path = $this->saveUserPicture($image);
-
-      // Check if image is displayed in user's profile page.
-      $this->drupalGet('user');
-      $this->assertRaw(file_uri_target($pic_path), t("Image is displayed in user's profile page"));
-
-      // Check if file is located in proper directory.
-      $this->assertTrue(is_file($pic_path), t('File is located in proper directory'));
-
-      // Set new picture dimensions.
-      $test_dim = ($info['width'] + 5) . 'x' . ($info['height'] + 5);
-      variable_set('user_picture_dimensions', $test_dim);
-
-      $pic_path2 = $this->saveUserPicture($image);
-      $this->assertNotEqual($pic_path, $pic_path2, t('Filename of second picture is different.'));
-    }
   }
 
   /**
    * Test HTTP schema working with user pictures.
+   *
+   * @todo OINK?
    */
-  function testExternalPicture() {
+  function DISABLEDtestExternalPicture() {
     $this->drupalLogin($this->user);
     // Set the default picture to an URI with a HTTP schema.
     $images = $this->drupalGetTestFiles('image');
@@ -1199,62 +973,36 @@
   }
 
   /**
-   * Tests deletion of user pictures.
+   * Tests creation, display, and deletion of user pictures.
    */
-  function testDeletePicture() {
+  function testCreateDeletePicture() {
     $this->drupalLogin($this->user);
 
     $image = current($this->drupalGetTestFiles('image'));
-    $info = image_get_info($image->uri);
-
-    // Set new variables: valid dimensions, valid filesize (0 = no limit).
-    $test_dim = ($info['width'] + 10) . 'x' . ($info['height'] + 10);
-    variable_set('user_picture_dimensions', $test_dim);
-    variable_set('user_picture_file_size', 0);
 
     // Save a new picture.
-    $edit = array('files[picture_upload]' => drupal_realpath($image->uri));
-    $this->drupalPost('user/' . $this->user->uid . '/edit', $edit, t('Save'));
+    $file = $this->saveUserPicture($image);
 
-    // Load actual user data from database.
-    $account = user_load($this->user->uid, TRUE);
-    $pic_path = !empty($account->picture) ? $account->picture->uri : NULL;
-
-    // Check if image is displayed in user's profile page.
+    // Verify that the image is displayed on the user account page.
     $this->drupalGet('user');
-    $this->assertRaw(file_uri_target($pic_path), "Image is displayed in user's profile page");
-
-    // Check if file is located in proper directory.
-    $this->assertTrue(is_file($pic_path), 'File is located in proper directory');
+    $this->assertRaw(file_uri_target($file->uri), t('User picture found on user account page.'));
 
-    $edit = array('picture_delete' => 1);
-    $this->drupalPost('user/' . $this->user->uid . '/edit', $edit, t('Save'));
-
-    // Load actual user data from database.
-    $account1 = user_load($this->user->uid, TRUE);
-    $this->assertFalse($account1->picture, 'User object has no picture');
-
-    $file = file_load($account->picture->fid);
-    $this->assertFalse($file, 'File is removed from database');
+    // Delete the picture.
+    $edit = array();
+    $this->drupalPost('user/' . $this->user->uid . '/edit', $edit, t('Remove'));
+    $this->drupalPost(NULL, array(), t('Save'));
 
+    // Verify that the image has been deleted.
+    $this->assertFalse(file_load($file->fid), 'File was removed from the database.');
     // Clear out PHP's file stat cache so we see the current value.
     clearstatcache();
-    $this->assertFalse(is_file($pic_path), 'File is removed from file system');
-  }
-
-  function saveUserPicture($image) {
-    $edit = array('files[picture_upload]' => drupal_realpath($image->uri));
-    $this->drupalPost('user/' . $this->user->uid . '/edit', $edit, t('Save'));
-
-    // Load actual user data from database.
-    $account = user_load($this->user->uid, TRUE);
-    return !empty($account->picture) ? $account->picture->uri : NULL;
+    $this->assertFalse(is_file($file->uri), 'File was removed from the file system.');
   }
 
   /**
    * Tests the admin form validates user picture settings.
    */
-  function testUserPictureAdminFormValidation() {
+  function TODOtestUserPictureAdminFormValidation() {
     $this->drupalLogin($this->drupalCreateUser(array('administer users')));
 
     // The default values are valid.
@@ -1268,8 +1016,63 @@
     $this->drupalPost('admin/config/people/accounts', $edit, t('Save configuration'));
     $this->assertNoText(t('The configuration options have been saved.'), 'The form does not save with an invalid file size.');
   }
+
+  /**
+   * Edits the user picture for the test user.
+   */
+  function saveUserPicture($image) {
+    $edit = array('files[field_user_picture_und_0]' => drupal_realpath($image->uri));
+    $this->drupalPost('user/' . $this->user->uid . '/edit', $edit, t('Save'));
+
+    // Load actual user data from database.
+    $account = user_load($this->user->uid, TRUE);
+    return file_load($account->field_user_picture[LANGUAGE_NOT_SPECIFIED][0]['fid']);
+  }
 }
 
+/**
+ * Tests embedded users on entities.
+ */
+class UserAttachTestCase extends DrupalWebTestCase {
+  protected $profile = 'standard';
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Embedded user on node page',
+      'description' => 'Verify that author details are shown on node and comment render.',
+      'group' => 'User',
+    );
+  }
+
+  /**
+   * Tests embedded users on node pages.
+   */
+  function testUserViewOnNodePage() {
+    $this->user = $this->drupalCreateUser();
+    $this->drupalLogin($this->user);
+    $edit = array(
+      'mail' => $this->user->mail,
+    );
+    $test_image = current($this->drupalGetTestFiles('image'));
+    $edit['files[field_user_picture_' . LANGUAGE_NOT_SPECIFIED . '_0]'] = drupal_realpath($test_image->uri);
+    $this->drupalPost('user/' . $this->user->uid . '/edit', $edit, t('Save'));
+
+    $node = $this->drupalCreateNode(array('type' => 'article'));
+    // Set display preferences so pictures are enabled for this content type.
+    variable_set('theme_settings', array('toggle_node_user_picture' => TRUE));
+    variable_set('node_submitted_' . $node->type, TRUE);
+    $this->drupalGet('node/' . $node->nid);
+    $this->assertRaw('field-name-field-user-picture', 'User picture is shown on node render.');
+
+    // Disable picture for nodes and enable for comments.
+    variable_set('theme_settings', array('toggle_comment_user_picture' => TRUE));
+
+    $edit = array();
+    $edit['comment_body[' . LANGUAGE_NOT_SPECIFIED . '][0][value]'] = $this->randomString();
+    $this->drupalPost(NULL, $edit, t('Save'));
+    $this->assertRaw('field-name-field-user-picture', 'User picture is shown on comment render.');
+  }
+}
 
 class UserPermissionsTestCase extends DrupalWebTestCase {
   protected $admin_user;
diff -u b/profiles/standard/standard.install b/profiles/standard/standard.install
--- b/profiles/standard/standard.install
+++ b/profiles/standard/standard.install
@@ -396,7 +396,6 @@
   );
   field_create_instance($instance);
 
-
   module_load_install('user');
   user_create_picture_field();