diff --git a/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php b/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php
index a062cad9d61da..be0bdaecf8de3 100644
--- a/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php
@@ -50,7 +50,7 @@ class AdminSessionsManagerTest extends \PHPUnit\Framework\TestCase
     /** @var  \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
     protected $objectManager;
 
-    /**
+    /*
      * @var RemoteAddress
      */
     protected $remoteAddressMock;
@@ -91,9 +91,7 @@ public function setUp()
             ['create']
         );
 
-        $this->currentSessionMock = $this->createPartialMock(
-            \Magento\Security\Model\AdminSessionInfo::class,
-            [
+        $this->currentSessionMock = $this->createPartialMock(\Magento\Security\Model\AdminSessionInfo::class, [
                 'isActive',
                 'getStatus',
                 'load',
@@ -103,8 +101,7 @@ public function setUp()
                 'getUserId',
                 'getSessionId',
                 'getUpdatedAt'
-            ]
-        );
+            ]);
 
         $this->securityConfigMock = $this->getMockBuilder(\Magento\Security\Model\ConfigInterface::class)
             ->disableOriginalConstructor()
@@ -154,7 +151,7 @@ public function testProcessLogin()
             ->method('getSessionId')
             ->willReturn($sessionId);
 
-        $this->authSessionMock->expects($this->any())
+        $this->authSessionMock->expects($this->once())
             ->method('getUser')
             ->willReturn($this->userMock);
         $this->userMock->expects($this->once())
@@ -256,10 +253,6 @@ public function testProcessProlong()
             ->method('save')
             ->willReturnSelf();
 
-        $this->authSessionMock->expects($this->once())
-            ->method('getUser')
-            ->willReturn($this->userMock);
-
         $this->model->processProlong();
     }
 
diff --git a/app/code/Magento/Security/etc/crontab.xml b/app/code/Magento/Security/etc/crontab.xml
index 203cf5c2a2389..5944ab41fc247 100644
--- a/app/code/Magento/Security/etc/crontab.xml
+++ b/app/code/Magento/Security/etc/crontab.xml
@@ -13,7 +13,7 @@
         <job name="security_clean_password_reset_request_event_records" instance="Magento\Security\Model\SecurityManager" method="cleanExpiredRecords">
             <schedule>0 0 * * *</schedule>
         </job>
-        <job name="security_expire_users" instance="Magento\Security\DisableExpiredUsers" method="deactivateExpiredUsers">
+        <job name="security_expire_users" instance="Magento\Security\Model\UserExpirationManager" method="deactivateExpiredUsers">
             <schedule>0 * * * *</schedule>
         </job>
     </group>
diff --git a/app/code/Magento/Security/etc/events.xml b/app/code/Magento/Security/etc/events.xml
index 640fcf7b3b20e..63c35d5c31a6f 100644
--- a/app/code/Magento/Security/etc/events.xml
+++ b/app/code/Magento/Security/etc/events.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="admin_user_save_after">