diff --git a/core/modules/locale/src/Tests/LocaleUpdateNotDevTest.php b/core/modules/locale/src/Tests/LocaleUpdateNotDevTest.php
deleted file mode 100644
index bd028a5..0000000
--- a/core/modules/locale/src/Tests/LocaleUpdateNotDevTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\locale\src\Tests\LocaleUpdateNotDevTest.
- */
-
-namespace Drupal\locale\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests that the language settings on block config appears correctly.
- *
- * @group language
- */
-class LocaleUpdateNotDevTest extends WebTestBase {
-
-  public static $modules = array('update', 'locale', 'locale_test_notdev');
-
-  public function testLocaleUpdateNotDev() {
-    module_load_include('compare.inc', 'locale');
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer languages', 'access administration pages', 'translate interface'));
-    $this->drupalLogin($admin_user);
-    $this->drupalPostForm('admin/config/regional/language/add', array('predefined_langcode' => 'hu'), t('Add language'));
-
-    // Set available Drupal releases for test.
-    $available = array(
-      'title' => 'Drupal core',
-      'short_name' => 'drupal',
-      'type' => 'project_core',
-      'api_version' => '8.x',
-      'project_status' => 'unsupported',
-      'link' => 'https://www.drupal.org/project/drupal',
-      'terms' => '',
-      'releases' => array(
-        '8.0.0-alpha110' => array(
-          'name'          => 'drupal 8.0.0-alpha110',
-          'version'       => '8.0.0-alpha110',
-          'tag'           => '8.0.0-alpha110',
-          'version_major' => '8',
-          'version_minor' => '0',
-          'version_patch' => '0',
-          'version_extra' => 'alpha110',
-          'status'        => 'published',
-          'release_link'  => 'https://www.drupal.org/node/2316617',
-          'download_link' => 'http://ftp.drupal.org/files/projects/drupal-8.0.0-alpha110.tar.gz',
-          'date'          => '1407344628',
-          'mdhash'        => '9d71afdd0ce541f2ff5ca2fbbca00df7',
-          'filesize'      => '9172832',
-          'files'         => '',
-          'terms'         => array(),
-        ),
-        '8.0.0-alpha100' => array(
-          'name'          => 'drupal 8.0.0-alpha100',
-          'version'       => '8.0.0-alpha100',
-          'tag'           => '8.0.0-alpha100',
-          'version_major' => '8',
-          'version_minor' => '0',
-          'version_patch' => '0',
-          'version_extra' => 'alpha100',
-          'status'        => 'published',
-          'release_link'  => 'https://www.drupal.org/node/2316617',
-          'download_link' => 'http://ftp.drupal.org/files/projects/drupal-8.0.0-alpha100.tar.gz',
-          'date'          => '1407344628',
-          'mdhash'        => '9d71afdd0ce541f2ff5ca2fbbca00df7',
-          'filesize'      => '9172832',
-          'files'         => '',
-          'terms'         => array(),
-        ),
-      ),
-    );
-    $available['last_fetch'] = time();
-    \Drupal::keyValueExpirable('update_available_releases')->setWithExpire('drupal', $available, 10);
-    $projects = locale_translation_build_projects();
-    $this->verbose($projects['drupal']->info['version']);
-    $this->assertEqual($projects['drupal']->info['version'], '8.0.0-alpha110', 'The first release with the same major release number which is not a dev release.');
-  }
-}
diff --git a/core/modules/locale/src/Tests/LocaleUpdateNotDevelopmentReleaseTest.php b/core/modules/locale/src/Tests/LocaleUpdateNotDevelopmentReleaseTest.php
new file mode 100644
index 0000000..5b05ede
--- /dev/null
+++ b/core/modules/locale/src/Tests/LocaleUpdateNotDevelopmentReleaseTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\locale\src\Tests\LocaleUpdateNotDevelopmentReleaseTest.
+ */
+
+namespace Drupal\locale\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Test for finding the first available normal core release version,
+ * in case of core is a development release.
+ *
+ * @group language
+ */
+class LocaleUpdateNotDevelopmentReleaseTest extends WebTestBase {
+
+  public static $modules = array('update', 'locale', 'locale_test_not_development_release');
+
+  protected function setUp() {
+    parent::setUp();
+    module_load_include('compare.inc', 'locale');
+    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer languages', 'access administration pages', 'translate interface'));
+    $this->drupalLogin($admin_user);
+    $this->drupalPostForm('admin/config/regional/language/add', array('predefined_langcode' => 'hu'), t('Add language'));
+  }
+
+  public function testLocaleUpdateNotDevelopmentRelease() {
+    // Set available Drupal releases for test.
+    $available = array(
+      'title' => 'Drupal core',
+      'short_name' => 'drupal',
+      'type' => 'project_core',
+      'api_version' => '8.x',
+      'project_status' => 'unsupported',
+      'link' => 'https://www.drupal.org/project/drupal',
+      'terms' => '',
+      'releases' => array(
+        '8.0.0-alpha110' => array(
+          'name'          => 'drupal 8.0.0-alpha110',
+          'version'       => '8.0.0-alpha110',
+          'tag'           => '8.0.0-alpha110',
+          'version_major' => '8',
+          'version_minor' => '0',
+          'version_patch' => '0',
+          'version_extra' => 'alpha110',
+          'status'        => 'published',
+          'release_link'  => 'https://www.drupal.org/node/2316617',
+          'download_link' => 'http://ftp.drupal.org/files/projects/drupal-8.0.0-alpha110.tar.gz',
+          'date'          => '1407344628',
+          'mdhash'        => '9d71afdd0ce541f2ff5ca2fbbca00df7',
+          'filesize'      => '9172832',
+          'files'         => '',
+          'terms'         => array(),
+        ),
+        '8.0.0-alpha100' => array(
+          'name'          => 'drupal 8.0.0-alpha100',
+          'version'       => '8.0.0-alpha100',
+          'tag'           => '8.0.0-alpha100',
+          'version_major' => '8',
+          'version_minor' => '0',
+          'version_patch' => '0',
+          'version_extra' => 'alpha100',
+          'status'        => 'published',
+          'release_link'  => 'https://www.drupal.org/node/2316617',
+          'download_link' => 'http://ftp.drupal.org/files/projects/drupal-8.0.0-alpha100.tar.gz',
+          'date'          => '1407344628',
+          'mdhash'        => '9d71afdd0ce541f2ff5ca2fbbca00df7',
+          'filesize'      => '9172832',
+          'files'         => '',
+          'terms'         => array(),
+        ),
+      ),
+    );
+    $available['last_fetch'] = REQUEST_TIME;
+    \Drupal::keyValueExpirable('update_available_releases')->setWithExpire('drupal', $available, 10);
+    $projects = locale_translation_build_projects();
+    $this->verbose($projects['drupal']->info['version']);
+    $this->assertEqual($projects['drupal']->info['version'], '8.0.0-alpha110', 'The first release with the same major release number which is not a development release.');
+  }
+}
diff --git a/core/modules/locale/tests/modules/locale_test_not_development_release/locale_test_not_development_release.info.yml b/core/modules/locale/tests/modules/locale_test_not_development_release/locale_test_not_development_release.info.yml
new file mode 100644
index 0000000..7acf9a0
--- /dev/null
+++ b/core/modules/locale/tests/modules/locale_test_not_development_release/locale_test_not_development_release.info.yml
@@ -0,0 +1,7 @@
+name: 'Locale Test Not Development Release'
+type: module
+description: 'The first release with the same major release number which is not a development release.'
+package: Testing
+version: VERSION
+core: 8.x
+hidden: true
diff --git a/core/modules/locale/tests/modules/locale_test_not_development_release/locale_test_not_development_release.module b/core/modules/locale/tests/modules/locale_test_not_development_release/locale_test_not_development_release.module
new file mode 100644
index 0000000..b6c8a9d
--- /dev/null
+++ b/core/modules/locale/tests/modules/locale_test_not_development_release/locale_test_not_development_release.module
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @file
+ * Simulate a Drupal version.
+ */
+
+use Drupal\Core\Extension\Extension;
+
+/**
+ * Implements hook_system_info_alter().
+ *
+ * Change the core version number to a development one for testing.
+ * 8.0.0-alpha102-dev is the simulated version.
+ */
+function locale_test_not_development_release_system_info_alter(&$info, Extension $file, $type) {
+  if(isset($info['package']) && $info['package']=='Core') {
+    $info['version'] = '8.0.0-alpha102-dev';
+  }
+}
diff --git a/core/modules/locale/tests/modules/locale_test_notdev/locale_test_notdev.info.yml b/core/modules/locale/tests/modules/locale_test_notdev/locale_test_notdev.info.yml
deleted file mode 100644
index 952fb2d..0000000
--- a/core/modules/locale/tests/modules/locale_test_notdev/locale_test_notdev.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'Locale Test NotDev'
-type: module
-description: 'The first release with the same major release number which is not a dev release.'
-package: Testing
-version: VERSION
-core: 8.x
-hidden: true
diff --git a/core/modules/locale/tests/modules/locale_test_notdev/locale_test_notdev.module b/core/modules/locale/tests/modules/locale_test_notdev/locale_test_notdev.module
deleted file mode 100644
index 2739b6a..0000000
--- a/core/modules/locale/tests/modules/locale_test_notdev/locale_test_notdev.module
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @file
- * Simulate a Drupal version.
- */
-
-use Drupal\Core\Extension\Extension;
-
-/**
- * Implements hook_system_info_alter().
- *
- * Change the Drupal version number to a dev one and make the test scripts
- * to be believe this is not a hidden test module, but a regular custom module.
- */
-function locale_test_notdev_system_info_alter(&$info, Extension $file, $type) {
-  if(isset($info['package']) && $info['package']=='Core') {
-    $info['version'] = '8.0.0-alpha102-dev';
-  }
-}