diff --git a/swift/common/manager.py b/swift/common/manager.py
index 32afdee852..318a74a9fd 100644
--- a/swift/common/manager.py
+++ b/swift/common/manager.py
@@ -31,7 +31,6 @@ SWIFT_DIR = '/etc/swift'
 RUN_DIR = '/var/run/swift'
 PROC_DIR = '/proc'
 
-# auth-server has been removed from ALL_SERVERS, start it explicitly
 ALL_SERVERS = ['account-auditor', 'account-server', 'container-auditor',
                'container-replicator', 'container-reconciler',
                'container-server', 'container-sync',
@@ -44,7 +43,7 @@ MAIN_SERVERS = ['proxy-server', 'account-server', 'container-server',
 REST_SERVERS = [s for s in ALL_SERVERS if s not in MAIN_SERVERS]
 # aliases mapping
 ALIASES = {'all': ALL_SERVERS, 'main': MAIN_SERVERS, 'rest': REST_SERVERS}
-GRACEFUL_SHUTDOWN_SERVERS = MAIN_SERVERS + ['auth-server']
+GRACEFUL_SHUTDOWN_SERVERS = MAIN_SERVERS
 START_ONCE_SERVERS = REST_SERVERS
 # These are servers that match a type (account-*, container-*, object-*) but
 # don't use that type-server.conf file and instead use their own.
diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py
index 865fcc3b80..78256282b5 100644
--- a/test/unit/common/test_manager.py
+++ b/test/unit/common/test_manager.py
@@ -2099,7 +2099,8 @@ class TestManager(unittest.TestCase):
 
         _orig_manager = manager.Manager
         try:
-            m = _orig_manager(['auth'])
+            m = _orig_manager(['*-server'])
+            self.assertEqual(len(m.servers), 4)
             for server in m.servers:
                 self.assertTrue(server.server in
                                 manager.GRACEFUL_SHUTDOWN_SERVERS)
@@ -2107,8 +2108,8 @@ class TestManager(unittest.TestCase):
             status = m.reload()
             self.assertEqual(status, 0)
             expected = {
-                'start': [{'graceful': True}],
-                'stop': [{'graceful': True}],
+                'start': [{'graceful': True}] * 4,
+                'stop': [{'graceful': True}] * 4,
             }
             self.assertEqual(MockManager.called, expected)
             # test force graceful