diff -u b/core/modules/migrate_drupal/config/install/migrate.migration.d7_file.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d7_file.yml
--- b/core/modules/migrate_drupal/config/install/migrate.migration.d7_file.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d7_file.yml
@@ -20,0 +21 @@
+  source_path_property: uri
diff -u b/core/modules/migrate_drupal/src/Plugin/migrate/source/d7/File.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d7/File.php
--- b/core/modules/migrate_drupal/src/Plugin/migrate/source/d7/File.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d7/File.php
@@ -46,7 +46,6 @@
       'filesize',
       'status',
       'timestamp',
-      'type'
     ));
     return $query;
   }
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/migrate_drupal/src/Tests/d7/MigrateFileTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Tests\d7\MigrateFileTest.
+ */
+
+namespace Drupal\migrate_drupal\Tests\d7;
+
+use Drupal\file\Entity\File;
+use Drupal\file\FileInterface;
+use Drupal\migrate\MigrateExecutable;
+
+/**
+ * Migrates Drupal 7 files.
+ *
+ * @group migrate_drupal 7.x
+ * @dumpFile FileManaged.php
+ * @migration d7_file
+ */
+class MigrateFileTest extends MigrateDrupal7TestBase {
+
+  /**
+   * The modules to be enabled during the test.
+   *
+   * @var array
+   */
+  static $modules = array(
+    'file',
+    'system',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(static::$modules);
+    $this->installEntitySchema('file');
+
+    // Load database dumps to provide source data.
+    $dumps = array(
+      $this->getDumpDirectory() . '/FileManaged.php',
+    );
+    $this->loadDumps($dumps);
+
+    // Create the source file so there's something to copy.
+    file_put_contents('public://cube.jpeg', str_repeat('*', 3620));
+
+    $migration = entity_load('migration', 'd7_file');
+    $executable = new MigrateExecutable($migration, $this);
+    $executable->import();
+  }
+
+  private function assertEntity($id, $expected_name, $expected_uri, $expected_mime, $expected_size, $is_permanent, $expected_creation_ts) {
+    /** @var \Drupal\file\FileInterface $file */
+    $file = File::load($id);
+    $this->assertTrue($file instanceof FileInterface);
+    $this->assertIdentical($expected_name, $file->getFilename());
+    $this->assertIdentical($expected_uri, $file->getFileUri());
+    $this->assertIdentical($expected_mime, $file->getMimeType());
+    $this->assertEqual($expected_size, $file->getSize());
+    $this->assertEqual($is_permanent, $file->isPermanent());
+    $this->assertEqual($expected_creation_ts, $file->getCreatedTime());
+  }
+
+  public function testFiles() {
+    $this->assertEntity(1, 'cube.jpeg', 'public://cube.jpeg', 'image/jpeg', 3620, TRUE, 1421727515);
+  }
+
+}