diff --git a/doc/source/associated_projects.rst b/doc/source/associated_projects.rst
index 3c7dc73a5a..00a748b93a 100644
--- a/doc/source/associated_projects.rst
+++ b/doc/source/associated_projects.rst
@@ -59,7 +59,7 @@ Authentication
 
 * `Keystone <https://github.com/openstack/keystone>`_ - Official Identity
   Service for OpenStack.
-* `Swauth <https://github.com/openstack/swauth>`_ - An alternative Swift
+* `Swauth <https://opendev.org/x/swauth/>`_ - **RETIRED**: An alternative Swift
   authentication service that only requires Swift itself.
 * `Basicauth <https://github.com/CloudVPS/swift-basicauth>`_ - HTTP Basic
   authentication support (keystone backed).
diff --git a/doc/source/overview_auth.rst b/doc/source/overview_auth.rst
index 59a42fb75e..9453aca951 100644
--- a/doc/source/overview_auth.rst
+++ b/doc/source/overview_auth.rst
@@ -373,8 +373,6 @@ Extending Auth
 
 TempAuth is written as wsgi middleware, so implementing your own auth is as
 easy as writing new wsgi middleware, and plugging it in to the proxy server.
-The `Swauth <https://github.com/openstack/swauth>`_ project is an example of
-an additional auth service.
 
 See :doc:`development_auth` for detailed information on extending the
 auth system.
diff --git a/test/unit/common/middleware/s3api/test_s3api.py b/test/unit/common/middleware/s3api/test_s3api.py
index 85a22a2296..980cd950e8 100644
--- a/test/unit/common/middleware/s3api/test_s3api.py
+++ b/test/unit/common/middleware/s3api/test_s3api.py
@@ -916,9 +916,6 @@ class TestS3ApiMiddleware(S3ApiTestCase):
             pipeline.return_value = 's3api s3token keystoneauth proxy-server'
             self.s3api.check_pipeline(self.conf)
 
-            pipeline.return_value = 's3api swauth proxy-server'
-            self.s3api.check_pipeline(self.conf)
-
             # Note that authtoken would need to have delay_auth_decision=True
             pipeline.return_value = 's3api authtoken s3token keystoneauth ' \
                 'proxy-server'
@@ -952,9 +949,6 @@ class TestS3ApiMiddleware(S3ApiTestCase):
                 'proxy-server'
             self.s3api.check_pipeline(self.conf)
 
-            pipeline.return_value = 's3api swauth proxy-server'
-            self.s3api.check_pipeline(self.conf)
-
             pipeline.return_value = 's3api authtoken s3token keystoneauth ' \
                 'proxy-server'
             self.s3api.check_pipeline(self.conf)