diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.2.0-rc2-b.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml
similarity index 100%
rename from core/modules/update/tests/modules/update_test/drupal.sec.2.0-rc2-b.xml
rename to core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml
diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.2.0-rc2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml
similarity index 100%
rename from core/modules/update/tests/modules/update_test/drupal.sec.2.0-rc2.xml
rename to core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml
diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.1.2_secure.xml b/core/modules/update/tests/modules/update_test/drupal.sec.1.2_secure.xml
deleted file mode 100644
index 8665e46b36..0000000000
--- a/core/modules/update/tests/modules/update_test/drupal.sec.1.2_secure.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns:dc="http://purl.org/dc/elements/1.1/">
-<title>Drupal</title>
-<short_name>drupal</short_name>
-<dc:creator>Drupal</dc:creator>
-<api_version>8.x</api_version>
-<recommended_major>8</recommended_major>
-<supported_majors>8</supported_majors>
-<default_major>8</default_major>
-<project_status>published</project_status>
-<link>http://example.com/project/drupal</link>
-  <terms>
-   <term><name>Projects</name><value>Drupal project</value></term>
-  </terms>
-<releases>
- <release>
-  <name>Drupal 8.1.2</name>
-  <version>8.1.2</version>
-  <tag>DRUPAL-8-1-2</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>2</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-8-1-2-release</release_link>
-  <download_link>http://example.com/drupal-8-1-2.tar.gz</download_link>
-  <date>1250424641</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>4294967296</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-   <term><name>Release type</name><value>Security update</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 8.1.1</name>
-  <version>8.1.1</version>
-  <tag>DRUPAL-8-1-1</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>1</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-8-1-1-release</release_link>
-  <download_link>http://example.com/drupal-8-1-1.tar.gz</download_link>
-  <date>1250424581</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>2147483648</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-   <term><name>Release type</name><value>Insecure</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 8.1.0</name>
-  <version>8.1.0</version>
-  <tag>DRUPAL-8-1-0</tag>
-  <version_major>8</version_major>
-  <version_minor>1</version_minor>
-  <version_patch>0</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-8-1-0-release</release_link>
-  <download_link>http://example.com/drupal-8-1-0.tar.gz</download_link>
-  <date>1250424521</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>1073741824</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-   <term><name>Release type</name><value>Insecure</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 8.0.2</name>
-  <version>8.0.2</version>
-  <tag>DRUPAL-8-0-2</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>2</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-8-0-2-release</release_link>
-  <download_link>http://example.com/drupal-8-0-2.tar.gz</download_link>
-  <date>1250424641</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>4294967296</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 8.0.1</name>
-  <version>8.0.1</version>
-  <tag>DRUPAL-8-0-1</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>1</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-8-0-1-release</release_link>
-  <download_link>http://example.com/drupal-8-0-1.tar.gz</download_link>
-  <date>1250424581</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>2147483648</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
- <release>
-  <name>Drupal 8.0.0</name>
-  <version>8.0.0</version>
-  <tag>DRUPAL-8-0-0</tag>
-  <version_major>8</version_major>
-  <version_minor>0</version_minor>
-  <version_patch>0</version_patch>
-  <status>published</status>
-  <release_link>http://example.com/drupal-8-0-0-release</release_link>
-  <download_link>http://example.com/drupal-8-0-0.tar.gz</download_link>
-  <date>1250424521</date>
-  <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
-  <filesize>1073741824</filesize>
-  <terms>
-   <term><name>Release type</name><value>New features</value></term>
-   <term><name>Release type</name><value>Bug fixes</value></term>
-  </terms>
- </release>
-</releases>
-</project>
diff --git a/core/modules/update/tests/src/Functional/UpdateContribTest.php b/core/modules/update/tests/src/Functional/UpdateContribTest.php
index e4e76ac572..1a6a76e2e2 100644
--- a/core/modules/update/tests/src/Functional/UpdateContribTest.php
+++ b/core/modules/update/tests/src/Functional/UpdateContribTest.php
@@ -548,14 +548,6 @@ public function securityUpdateAvailabilityProvider() {
         'expected_update_message_type' => static::UPDATE_AVAILABLE,
         'fixture' => 'sec.8.x-2.2_1.x_secure',
       ],
-      // On latest security release for module major release 1.
-      // Security release also available for next major.
-//      '8.x-1.2, 8.x-1.2 8.x-2.2' => [
-//        'module_patch_version' => '8.x-1.2',
-//        'expected_security_release' => [],
-//        'expected_update_message_type' => static::UPDATE_NONE,
-//        'fixture' => 'sec.8.x-1.2_8.x-2.2',
-//      ],
       // @todo In https://www.drupal.org/node/2865920 add test cases:
       //   - 8.x-2.0 using fixture 'sec.8.x-1.2_8.x-2.2' to ensure that 8.x-2.2
       //     is the only security update.
diff --git a/core/modules/update/tests/src/Functional/UpdateCoreTest.php b/core/modules/update/tests/src/Functional/UpdateCoreTest.php
index af742665c0..5ecbbe7b08 100644
--- a/core/modules/update/tests/src/Functional/UpdateCoreTest.php
+++ b/core/modules/update/tests/src/Functional/UpdateCoreTest.php
@@ -191,7 +191,7 @@ public function testSecurityUpdateAvailability($site_patch_version, array $expec
    *   - 8.0.2 Security update
    *   - 8.0.1 Insecure
    *   - 8.0.0 Insecure
-   * - drupal.sec.2.0-rc2.xml
+   * - drupal.sec.0.2-rc2.xml
    *   - 8.2.0-rc2 Security update
    *   - 8.2.0-rc1 Insecure
    *   - 8.2.0-beta2 Insecure
@@ -218,7 +218,7 @@ public function testSecurityUpdateAvailability($site_patch_version, array $expec
    *   - 8.0.2 Insecure
    *   - 8.0.1 Insecure
    *   - 8.0.0 Insecure
-   * - drupal.sec.2.0-rc2-b.xml
+   * - drupal.sec.0.2-rc2-b.xml
    *   - 8.2.0-rc2
    *   - 8.2.0-rc1
    *   - 8.2.0-beta2
@@ -231,13 +231,6 @@ public function testSecurityUpdateAvailability($site_patch_version, array $expec
    *   - 8.0.2 Security update
    *   - 8.0.1 Insecure
    *   - 8.0.0 Insecure
-   * - drupal.sec.1.2_secure.xml
-   *   - 8.1.2 Security update
-   *   - 8.1.1 Insecure
-   *   - 8.1.0 Insecure
-   *   - 8.0.2 Insecure
-   *   - 8.0.1 Insecure
-   *   - 8.0.0 Insecure
    */
   public function securityUpdateAvailabilityProvider() {
     $test_cases = [
@@ -288,7 +281,10 @@ public function securityUpdateAvailabilityProvider() {
         'site_patch_version' => '1.2',
         'expected_security_releases' => [],
         'expected_update_message_type' => static::UPDATE_NONE,
-        'fixture' => 'sec.2.0-rc2',
+        // @todo Change to use fixture 'sec.0.2-rc2' in
+        // https://www.drupal.org/node/2804155. Currently this case would fail
+        // because 8.2.0-rc2 would be the recommend security release.
+        'fixture' => 'sec.0.2-rc2-b',
       ],
       // No security release available for site minor release 0.
       // Security release available for next minor.
@@ -298,20 +294,6 @@ public function securityUpdateAvailabilityProvider() {
         'expected_update_message_type' => static::SECURITY_UPDATE_REQUIRED,
         'fixture' => 'sec.1.2_insecure',
       ],
-      // All releases for minor 0 are secure.
-      // Security release available for next minor.
-      '0.0, 1.2, secure' => [
-        'site_patch_version' => '0.0',
-        'expected_security_release' => ['1.2'],
-        'expected_update_message_type' => static::UPDATE_AVAILABLE,
-        'fixture' => 'sec.1.2_secure',
-      ],
-      '0.2, 1.2, secure' => [
-        'site_patch_version' => '0.2',
-        'expected_security_release' => ['1.2'],
-        'expected_update_message_type' => static::UPDATE_AVAILABLE,
-        'fixture' => 'sec.1.2_secure',
-      ],
       // Site on 2.0-rc2 which is a security release.
       '2.0-rc2, 0.2 1.2' => [
         'site_patch_version' => '2.0-rc2',