diff --git a/tests/src/Kernel/Migrate/MigrateMetatagTest.php b/tests/src/Kernel/Migrate/MigrateMetatagTest.php
deleted file mode 100644
index b7ba330..0000000
--- a/tests/src/Kernel/Migrate/MigrateMetatagTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace Drupal\Tests\metatag\Kernel\Migrate\d7;
-
-use Drupal\node\Entity\Node;
-use Drupal\node\NodeInterface;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\TermInterface;
-use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
-use Drupal\user\Entity\User;
-use Drupal\user\UserInterface;
-
-/**
- * Tests metatag migration.
- *
- * @group metatag
- */
-class MigrateMetatagTest extends MigrateDrupal7TestBase {
-
-  static $modules = [
-    'metatag',
-    'comment',
-    'datetime',
-    'filter',
-    'image',
-    'link',
-    'node',
-    'taxonomy',
-    'telephone',
-    'text',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->loadFixture(__DIR__ . '/../../../../tests/fixtures/drupal7.php');
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installEntitySchema('file');
-    $this->installConfig(static::$modules);
-    $this->installSchema('node', ['node_access']);
-    $this->installSchema('system', ['sequences']);
-
-    $this->executeMigrations([
-      'd7_metatag_field',
-      'd7_node_type',
-      'd7_taxonomy_vocabulary',
-      'd7_metatag_field_instance',
-      'd7_metatag_field_instance_widget_settings',
-      'd7_user_role',
-      'd7_user',
-      'd7_comment_type',
-      'd7_field',
-      'd7_field_instance',
-      'd7_node:test_content_type',
-      'd7_node:article',
-      'd7_node_revision:test_content_type',
-      'd7_taxonomy_term',
-    ]);
-  }
-
-  /**
-   * Test metatag migration from Drupal 7 to 8.
-   */
-  public function testMetatag() {
-    /** @var Node $node */
-    $node = Node::load(3);
-    $this->assertTrue($node instanceof NodeInterface);
-    $this->assertTrue($node->hasField('field_metatag'));
-    $this->assertSame('a:1:{s:8:"keywords";a:1:{s:5:"value";s:7:"keynode";}}', $node->field_metatag->value);
-
-    $node = node_revision_load(3);
-    $this->assertTrue($node instanceof NodeInterface);
-    $this->assertTrue($node->hasField('field_metatag'));
-    $this->assertSame('a:1:{s:8:"keywords";a:1:{s:5:"value";s:15:"keynoderevision";}}', $node->field_metatag->value);
-
-    /** @var User $user */
-    $user = User::load(2);
-    $this->assertTrue($user instanceof UserInterface);
-    $this->assertTrue($user->hasField('field_metatag'));
-    $this->assertSame('a:1:{s:8:"keywords";a:1:{s:5:"value";s:7:"keyuser";}}', $user->field_metatag->value);
-
-    /** @var Term $term */
-    $term = Term::load(2);
-    $this->assertTrue($term instanceof TermInterface);
-    $this->assertTrue($term->hasField('field_metatag'));
-    $this->assertSame('a:1:{s:8:"keywords";a:1:{s:5:"value";s:12:"keytaxonomy2";}}', $term->field_metatag->value);
-  }
-}
diff --git a/tests/src/Kernel/Migrate/d7/MigrateMetatagTest.php b/tests/src/Kernel/Migrate/d7/MigrateMetatagTest.php
new file mode 100644
index 0000000..b7ba330
--- /dev/null
+++ b/tests/src/Kernel/Migrate/d7/MigrateMetatagTest.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Drupal\Tests\metatag\Kernel\Migrate\d7;
+
+use Drupal\node\Entity\Node;
+use Drupal\node\NodeInterface;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\TermInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\user\Entity\User;
+use Drupal\user\UserInterface;
+
+/**
+ * Tests metatag migration.
+ *
+ * @group metatag
+ */
+class MigrateMetatagTest extends MigrateDrupal7TestBase {
+
+  static $modules = [
+    'metatag',
+    'comment',
+    'datetime',
+    'filter',
+    'image',
+    'link',
+    'node',
+    'taxonomy',
+    'telephone',
+    'text',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->loadFixture(__DIR__ . '/../../../../tests/fixtures/drupal7.php');
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installEntitySchema('file');
+    $this->installConfig(static::$modules);
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('system', ['sequences']);
+
+    $this->executeMigrations([
+      'd7_metatag_field',
+      'd7_node_type',
+      'd7_taxonomy_vocabulary',
+      'd7_metatag_field_instance',
+      'd7_metatag_field_instance_widget_settings',
+      'd7_user_role',
+      'd7_user',
+      'd7_comment_type',
+      'd7_field',
+      'd7_field_instance',
+      'd7_node:test_content_type',
+      'd7_node:article',
+      'd7_node_revision:test_content_type',
+      'd7_taxonomy_term',
+    ]);
+  }
+
+  /**
+   * Test metatag migration from Drupal 7 to 8.
+   */
+  public function testMetatag() {
+    /** @var Node $node */
+    $node = Node::load(3);
+    $this->assertTrue($node instanceof NodeInterface);
+    $this->assertTrue($node->hasField('field_metatag'));
+    $this->assertSame('a:1:{s:8:"keywords";a:1:{s:5:"value";s:7:"keynode";}}', $node->field_metatag->value);
+
+    $node = node_revision_load(3);
+    $this->assertTrue($node instanceof NodeInterface);
+    $this->assertTrue($node->hasField('field_metatag'));
+    $this->assertSame('a:1:{s:8:"keywords";a:1:{s:5:"value";s:15:"keynoderevision";}}', $node->field_metatag->value);
+
+    /** @var User $user */
+    $user = User::load(2);
+    $this->assertTrue($user instanceof UserInterface);
+    $this->assertTrue($user->hasField('field_metatag'));
+    $this->assertSame('a:1:{s:8:"keywords";a:1:{s:5:"value";s:7:"keyuser";}}', $user->field_metatag->value);
+
+    /** @var Term $term */
+    $term = Term::load(2);
+    $this->assertTrue($term instanceof TermInterface);
+    $this->assertTrue($term->hasField('field_metatag'));
+    $this->assertSame('a:1:{s:8:"keywords";a:1:{s:5:"value";s:12:"keytaxonomy2";}}', $term->field_metatag->value);
+  }
+}
diff --git a/tests/src/Unit/Migrate/d7/MetatagFieldTest.php b/tests/src/Unit/Migrate/d7/MetatagFieldTest.php
new file mode 100644
index 0000000..0cba8e1
--- /dev/null
+++ b/tests/src/Unit/Migrate/d7/MetatagFieldTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Drupal\Tests\metatag\Unit\Migrate\d7;
+
+use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
+
+/**
+ * Tests D7 metatag field source plugin.
+ *
+ * @group metatag
+ */
+class MetatagFieldTest extends MigrateSqlSourceTestCase {
+
+  const PLUGIN_CLASS = 'Drupal\metatag\Plugin\migrate\source\d7\MetatagField';
+
+  protected $migrationConfiguration = array(
+    'id' => 'test',
+    'source' => array(
+      'plugin' => 'd7_metatag_field',
+    ),
+  );
+
+  protected $expectedResults = array(
+    array(
+      'entity_type' => 'node',
+    ),
+    array(
+      'entity_type' => 'taxonomy_term',
+    ),
+    array(
+      'entity_type' => 'user',
+    ),
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->databaseContents['metatag'] = $this->expectedResults;
+    parent::setUp();
+  }
+
+}