diff --git a/lib/pbench/client/oidc_admin.py b/lib/pbench/client/oidc_admin.py
index 99d4952185..d21a6cb0d9 100644
--- a/lib/pbench/client/oidc_admin.py
+++ b/lib/pbench/client/oidc_admin.py
@@ -63,9 +63,7 @@ def create_new_user(
         """
         admin_token = self.get_admin_token().get("access_token")
         url_path = f"/admin/realms/{self.OIDC_REALM}/users"
-        headers = {
-            "Authorization": f"Bearer {admin_token}",
-        }
+        headers = {"Authorization": f"Bearer {admin_token}"}
         data = {
             "username": username,
             "email": email,
@@ -135,9 +133,7 @@ def get_user(self, username: str, token: str) -> dict:
         """
         response = self.get(
             f"admin/realms/{self.OIDC_REALM}/users",
-            headers={
-                "Authorization": f"Bearer {token}",
-            },
+            headers={"Authorization": f"Bearer {token}"},
             username=username,
         )
         if response.status_code == HTTPStatus.OK:
diff --git a/lib/pbench/server/auth/__init__.py b/lib/pbench/server/auth/__init__.py
index 1fdc2f7e2b..9dd1b1806d 100644
--- a/lib/pbench/server/auth/__init__.py
+++ b/lib/pbench/server/auth/__init__.py
@@ -4,7 +4,7 @@
 from dataclasses import dataclass
 from http import HTTPStatus
 import logging
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 from urllib.parse import urljoin
 
 import jwt
@@ -332,7 +332,7 @@ def __init__(
         client_id: str,
         realm_name: str,
         verify: bool = True,
-        headers: Optional[Dict[str, str]] = None,
+        headers: Optional[dict[str, str]] = None,
     ):
         """Initialize an OpenID Connect Client object.
 
diff --git a/lib/pbench/test/functional/server/test_user.py b/lib/pbench/test/functional/server/test_user.py
deleted file mode 100644
index 5aef76a211..0000000000
--- a/lib/pbench/test/functional/server/test_user.py
+++ /dev/null
@@ -1,214 +0,0 @@
-# from http import HTTPStatus
-#
-# import pytest
-# from requests import HTTPError
-#
-# from pbench.client import API, PbenchServerClient
-#
-# USERNAME1 = "functional"
-# USERNAME2 = "nonfunctional"
-# PASSWORD = "tests"
-#
-#
-# class TestUser:
-#     """
-#     Pbench Server functional tests for basic "user" operations.
-#
-#     NOTE: The functional test system is intended to run on a pristine
-#     containerized Pbench Server. We could check for some pre-conditions if we
-#     had a known Administrative user (e.g., admin/admin).
-#     """
-#
-#     def test_login_fail(self, server_client: PbenchServerClient):
-#         """
-#         Trying to log in to a non-existent user should fail.
-#
-#         NOTE: This will fail if "nouser" exists.
-#         """
-#         with pytest.raises(
-#             HTTPError,
-#             match=f"UNAUTHORIZED for url: {server_client.scheme}://.*?/api/v1/login",
-#         ):
-#             server_client.login("nouser", "nopassword")
-#
-#     @pytest.mark.parametrize(
-#         "json",
-#         [
-#             {
-#                 "username": USERNAME1,
-#                 "first_name": "Test",
-#                 "last_name": "Account",
-#                 "password": PASSWORD,
-#                 "email": f"{USERNAME1}@gmail.com",
-#             },
-#             {
-#                 "username": USERNAME2,
-#                 "first_name": "Tester",
-#                 "last_name": "Accountant",
-#                 "password": PASSWORD,
-#                 "email": f"{USERNAME2}@gmail.com",
-#             },
-#         ],
-#     )
-#     def test_register(self, server_client: PbenchServerClient, json):
-#         """
-#         Test that we can register a new user.
-#
-#         NOTE: This will fail if the username already exists.
-#         """
-#         response = server_client.post(API.REGISTER, json=json, raise_error=False)
-#         assert (
-#             response.status_code == HTTPStatus.CREATED
-#         ), f"Register failed with {response.json()}"
-#
-#     def test_register_redux(self, server_client: PbenchServerClient):
-#         """
-#         Test that an attempt to register an existing user fails.
-#         """
-#         json = {
-#             "username": USERNAME1,
-#             "first_name": "Repeat",
-#             "last_name": "Redux",
-#             "password": PASSWORD,
-#             "email": f"{USERNAME1}@gmail.com",
-#         }
-#         with pytest.raises(
-#             HTTPError,
-#             match=f"FORBIDDEN for url: {server_client.scheme}://.*?/api/v1/register",
-#         ):
-#             server_client.post(API.REGISTER, json=json)
-#
-#     def test_profile_noauth(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can't access a user profile without authentication.
-#         """
-#         with pytest.raises(
-#             HTTPError,
-#             match=f"UNAUTHORIZED for url: {server_client.scheme}://.*?/api/v1/user/{USERNAME1}",
-#         ):
-#             server_client.get(API.USER, {"target_username": USERNAME1})
-#
-#     def test_login(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can log in using our new user.
-#
-#         NOTE: This assumes test cases will be run in order. There are Pytest
-#         plugins to explicitly control test case order, but Pytest generally
-#         does run tests within a single class in order. Is it worth taking on
-#         another dependency to make this explicit?
-#         """
-#         server_client.login(USERNAME1, PASSWORD)
-#         assert server_client.auth_token
-#
-#     def test_profile_bad_auth(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can't access a user profile with an invalid authentication
-#         token.
-#         """
-#         with pytest.raises(
-#             HTTPError,
-#             match=f"UNAUTHORIZED for url: {server_client.scheme}://.*?/api/v1/user/{USERNAME1}",
-#         ):
-#             server_client.get(
-#                 API.USER,
-#                 {"target_username": USERNAME1},
-#                 headers={"Authorization": "Bearer of bad tokens"},
-#             )
-#
-#     def test_profile_not_self(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can't access another user's profile.
-#         """
-#         with pytest.raises(
-#             HTTPError,
-#             match=f"FORBIDDEN for url: {server_client.scheme}://.*?/api/v1/user/{USERNAME2}",
-#         ):
-#             server_client.get(API.USER, {"target_username": USERNAME2})
-#
-#     def test_profile(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can retrieve our own user profile once logged in.
-#
-#         NOTE: This assumes test cases will be run in order.
-#         """
-#         response = server_client.get(API.USER, {"target_username": USERNAME1})
-#         assert response.json()["username"] == USERNAME1
-#
-#     def test_update(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can update our own user profile once logged in.
-#
-#         NOTE: This assumes test cases will be run in order.
-#         """
-#         response = server_client.get(API.USER, {"target_username": USERNAME1})
-#         user = response.json()
-#         assert user["first_name"] != "Mycroft"
-#         user["first_name"] = "Mycroft"
-#
-#         # Remove fields that PUT will reject, but use a copy so that we can
-#         # compare the new value against what we expect.
-#         #
-#         # This is unfortunate: PUT should IGNORE unmodifiable fields to allow a
-#         # standard REST GET/update/PUT sequence.
-#         payload = user.copy()
-#         del payload["registered_on"]
-#
-#         response = server_client.put(
-#             API.USER, {"target_username": USERNAME1}, json=payload
-#         )
-#         put_response = response.json()
-#
-#         response = server_client.get(API.USER, {"target_username": USERNAME1})
-#         updated = response.json()
-#         assert user == updated
-#         assert put_response == user
-#
-#     def test_delete_other(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can't delete another user.
-#
-#         NOTE: This assumes test cases will be run in order.
-#         """
-#         with pytest.raises(
-#             HTTPError,
-#             match=f"FORBIDDEN for url: {server_client.scheme}://.*?/api/v1/user/{USERNAME2}",
-#         ):
-#             server_client.delete(API.USER, {"target_username": USERNAME2})
-#
-#     def test_delete_nologin(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can't delete a user profile when not logged in.
-#
-#         NOTE: This assumes test cases will be run in order.
-#         """
-#         server_client.logout()
-#         with pytest.raises(
-#             HTTPError,
-#             match=f"UNAUTHORIZED for url: {server_client.scheme}://.*?/api/v1/user/{USERNAME1}",
-#         ):
-#             server_client.delete(API.USER, {"target_username": USERNAME1})
-#
-#     def test_delete(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can delete our own user profile once logged in.
-#
-#         NOTE: This assumes test cases will be run in order.
-#         """
-#         server_client.login(USERNAME1, PASSWORD)
-#         server_client.delete(API.USER, {"target_username": USERNAME1})
-#
-#     def test_logout(self, server_client: PbenchServerClient):
-#         """
-#         Test that we can log out from our session.
-#
-#         NOTE: This assumes test cases will be run in order.
-#         """
-#         server_client.logout()
-#         assert server_client.auth_token is None
-#
-#     def test_cleanup_user2(self, server_client: PbenchServerClient):
-#         """
-#         Remove the second test user to make the test idempotent.
-#         """
-#         server_client.login(USERNAME2, PASSWORD)
-#         server_client.delete(API.USER, {"target_username": USERNAME2})