diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
index 26c3630..fbbf054 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
@@ -563,6 +563,15 @@ public function load() {
       'name' => 'site_slogan',
       'value' => 's:10:"The Slogan";',
     ))->values(array(
+      'name' => 'statistics_block_top_all_num',
+      'value' => 'i:55;',
+    ))->values(array(
+      'name' => 'statistics_block_top_day_num',
+      'value' => 'i:30;',
+    ))->values(array(
+      'name' => 'statistics_block_top_last_num',
+      'value' => 'i:9;',
+    ))->values(array(
       'name' => 'statistics_count_content_views',
       'value' => 'i:1;',
     ))->values(array(
@@ -707,4 +716,4 @@ public function load() {
   }
 
 }
-#d20a0a7f31645aba285f0ce7505c80a5
+#3de49527faa2cd3e07401b5d941f1ca7
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index 0eaddf5..43aeae5 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -112,7 +112,7 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'd6_search_page',
     'd6_search_settings',
     'd6_simpletest_settings',
-    'd6_statistics_settings',
+    'statistics_settings',
     'd6_syslog_settings',
     'd6_system_cron',
     'd6_system_date',
diff --git a/core/modules/statistics/config/schema/statistics.schema.yml b/core/modules/statistics/config/schema/statistics.schema.yml
index 81ed438..c1421ef 100644
--- a/core/modules/statistics/config/schema/statistics.schema.yml
+++ b/core/modules/statistics/config/schema/statistics.schema.yml
@@ -17,17 +17,3 @@ statistics.settings:
     count_content_views:
       type: integer
       label: 'Count content views'
-
-block.settings.statistics_popular_block:
-  type: block_settings
-  label: 'Popular content block settings'
-  mapping:
-    top_day_num:
-      type: integer
-      label: 'Number of day\s top views to display'
-    top_all_num:
-      type: integer
-      label: 'Number of all time views to display'
-    top_last_num:
-      type: integer
-      label: 'Number of most recent views to display'
diff --git a/core/modules/statistics/migration_templates/d6_statistics_settings.yml b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
deleted file mode 100644
index 348ad38..0000000
--- a/core/modules/statistics/migration_templates/d6_statistics_settings.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: d6_statistics_settings
-label: Statistics configuration
-migration_tags:
-  - Drupal 6
-source:
-  plugin: variable
-  variables:
-    - statistics_enable_access_log
-    - statistics_flush_accesslog_timer
-    - statistics_count_content_views
-process:
-  'access_log/enabled': statistics_enable_access_log
-  'access_log/max_lifetime': statistics_flush_accesslog_timer
-  'count_content_views': statistics_count_content_views
-destination:
-  plugin: config
-  config_name: statistics.settings
diff --git a/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml b/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml
new file mode 100644
index 0000000..51eefab
--- /dev/null
+++ b/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml
@@ -0,0 +1,20 @@
+id: statistics_popular_block_settings
+label: Statistics popular block configuration
+migration_tags:
+  - Drupal 6
+  - Drupal 7
+source:
+  plugin: variable
+  variables:
+    - statistics_block_top_day_num
+    - statistics_block_top_all_num
+    - statistics_block_top_last_num
+process:
+  settings/top_day_num: statistics_block_top_day_num
+  settings/top_all_num: statistics_block_top_all_num
+  settings/top_last_num: statistics_block_top_last_num
+destination:
+  plugin: config
+  config_name: block.block.popularcontent
+migration_dependences:
+  - d7_block
diff --git a/core/modules/statistics/migration_templates/statistics_settings.yml b/core/modules/statistics/migration_templates/statistics_settings.yml
new file mode 100644
index 0000000..62c2c06
--- /dev/null
+++ b/core/modules/statistics/migration_templates/statistics_settings.yml
@@ -0,0 +1,18 @@
+id: statistics_settings
+label: Statistics configuration
+migration_tags:
+  - Drupal 6
+  - Drupal 7
+source:
+  plugin: variable
+  variables:
+    - statistics_enable_access_log
+    - statistics_flush_accesslog_timer
+    - statistics_count_content_views
+process:
+  'access_log/enabled': statistics_enable_access_log
+  'access_log/max_lifetime': statistics_flush_accesslog_timer
+  'count_content_views': statistics_count_content_views
+destination:
+  plugin: config
+  config_name: statistics.settings
diff --git a/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsConfigsTest.php b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsConfigsTest.php
new file mode 100644
index 0000000..599710e
--- /dev/null
+++ b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsConfigsTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\statistics\Tests\Migrate\MigrateStatisticsConfigsTest.
+ */
+
+namespace Drupal\statistics\Tests\Migrate;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to statistics.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('statistics');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('statistics_settings');
+  }
+
+  /**
+   * Tests migration of statistics variables to statistics.settings.yml.
+   */
+  public function testStatisticsSettings() {
+    $config = $this->config('statistics.settings');
+    $this->assertIdentical(FALSE, $config->get('access_log.enabled'));
+    $this->assertIdentical(259200, $config->get('access_log.max_lifetime'));
+    $this->assertIdentical(0, $config->get('count_content_views'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php
new file mode 100644
index 0000000..d603926
--- /dev/null
+++ b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\statistics\Tests\Migrate\MigrateStatisticsPopularBlockSettingsTest.
+ */
+
+namespace Drupal\statistics\Tests\Migrate;
+
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of settings for the Popular block.
+ *
+ * @group statistics
+ */
+class MigrateStatisticsPopularBlockSettingsTest extends MigrateDrupal7TestBase {
+
+  use SchemaCheckTestTrait;
+
+  public static $modules = ['statistics'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigration('statistics_popular_block_settings');
+  }
+
+  /**
+   * Tests migration of Popular block settings into configuration.
+   */
+  public function testMigration() {
+    $config = $this->config('block.block.popularcontent');
+    $this->assertIdentical(55, $config->get('settings.top_all_num'));
+    $this->assertIdentical(30, $config->get('settings.top_day_num'));
+    $this->assertIdentical(9, $config->get('settings.top_last_num'));
+  }
+
+}
diff --git a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
deleted file mode 100644
index 4e845c2..0000000
--- a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\statistics\Tests\Migrate\d6\MigrateStatisticsConfigsTest.
- */
-
-namespace Drupal\statistics\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to statistics.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('statistics');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_statistics_settings');
-  }
-
-  /**
-   * Tests migration of statistics variables to statistics.settings.yml.
-   */
-  public function testStatisticsSettings() {
-    $config = $this->config('statistics.settings');
-    $this->assertIdentical(FALSE, $config->get('access_log.enabled'));
-    $this->assertIdentical(259200, $config->get('access_log.max_lifetime'));
-    $this->assertIdentical(0, $config->get('count_content_views'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get());
-  }
-
-}