diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index d15c07f..70e752a 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -885,7 +885,6 @@ function install_system_rebuild(&$install_state) {
   // into a regular bootstrap state.
   unset($conf['cache_classes']);
   unset($conf['keyvalue_default']);
-  unset($conf['lock_backend']);
 
   // Ensure that custom service definitions in a prepared settings.php are
   // applied. This effectively allows to install Drupal with custom Cache,
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/StateSystemUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/StateSystemUpgradePathTest.php
index 5f7f05c..47cd712 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/StateSystemUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/StateSystemUpgradePathTest.php
@@ -43,11 +43,6 @@ public function testSystemVariableUpgrade() {
       'value' => 'done',
       'variable_name' => 'install_task',
     );
-    $expected_state['system.path_alias_whitelist'] = array(
-      'value' => array(
-      ),
-      'variable_name' => 'path_alias_whitelist',
-    );
     $expected_state['node.node_access_needs_rebuild'] = array(
       'value' => TRUE,
       'variable_name' => 'node_access_needs_rebuild',