diff --git a/backend/lcfs/tests/test_auth_middleware.py b/backend/lcfs/tests/test_auth_middleware.py
index d59076107..083c188a5 100644
--- a/backend/lcfs/tests/test_auth_middleware.py
+++ b/backend/lcfs/tests/test_auth_middleware.py
@@ -1,9 +1,11 @@
 from unittest.mock import AsyncMock, patch, MagicMock, Mock
 
 import pytest
-import asyncio
+import json
+import redis
 from starlette.exceptions import HTTPException
 from starlette.requests import Request
+from redis.asyncio import Redis, ConnectionPool
 
 from lcfs.db.models import UserProfile
 from lcfs.services.keycloak.authentication import UserAuthentication
@@ -35,43 +37,112 @@ def auth_backend(redis_pool, session_generator, settings):
 
 
 @pytest.mark.anyio
-async def test_load_jwk_from_redis(auth_backend):
-    # Mock auth_backend.redis_pool.get to return a JSON string directly
-    with patch.object(auth_backend.redis_pool, "get", new_callable=AsyncMock) as mock_redis_get:
-        mock_redis_get.return_value = '{"jwks": "jwks", "jwks_uri": "jwks_uri"}'
+async def test_load_jwk_from_redis():
+    # Initialize mock Redis client
+    mock_redis = AsyncMock(spec=Redis)
+    mock_redis.get = AsyncMock(
+        return_value='{"jwks": "jwks_data", "jwks_uri": "jwks_uri_data"}'
+    )
 
+    # Mock the async context manager (__aenter__ and __aexit__)
+    mock_redis.__aenter__.return_value = mock_redis
+    mock_redis.__aexit__.return_value = AsyncMock()
+
+    # Initialize mock ConnectionPool
+    mock_redis_pool = AsyncMock(spec=ConnectionPool)
+
+    # Patch the Redis class in the UserAuthentication module to return mock_redis
+    with patch("lcfs.services.keycloak.authentication.Redis", return_value=mock_redis):
+        # Initialize UserAuthentication with the mocked ConnectionPool
+        auth_backend = UserAuthentication(
+            redis_pool=mock_redis_pool,
+            session_factory=AsyncMock(),
+            settings=MagicMock(
+                well_known_endpoint="https://example.com/.well-known/openid-configuration"
+            ),
+        )
+
+        # Call refresh_jwk
         await auth_backend.refresh_jwk()
 
-        assert auth_backend.jwks == "jwks"
-        assert auth_backend.jwks_uri == "jwks_uri"
+        # Assertions to verify JWKS data was loaded correctly
+        assert auth_backend.jwks == "jwks_data"
+        assert auth_backend.jwks_uri == "jwks_uri_data"
+
+        # Verify that Redis `get` was called with the correct key
+        mock_redis.get.assert_awaited_once_with("jwks_data")
 
 
 @pytest.mark.anyio
 @patch("httpx.AsyncClient.get")
-async def test_refresh_jwk_sets_new_keys_in_redis(mock_get, auth_backend):
-    # Create a mock response object
-    mock_response = MagicMock()
-
-    # Set up the json method to return a dictionary with a .get method
-    mock_json = MagicMock()
-    mock_json.get.return_value = "{}"
-
-    # Assign the mock_json to the json method of the response
-    mock_response.json.return_value = mock_json
-
-    mock_response_2 = MagicMock()
-    mock_response_2.json.return_value = "{}"
-
-    mock_get.side_effect = [
-        mock_response,
-        mock_response_2,
-    ]
-
-    with patch.object(auth_backend.redis_pool, "get", new_callable=AsyncMock) as mock_redis_get:
-        mock_redis_get.return_value = None
-
+async def test_refresh_jwk_sets_new_keys_in_redis(mock_httpx_get):
+    # Mock responses for the well-known endpoint and JWKS URI
+    mock_oidc_response = MagicMock()
+    mock_oidc_response.json.return_value = {"jwks_uri": "https://example.com/jwks"}
+    mock_oidc_response.raise_for_status = MagicMock()
+
+    mock_certs_response = MagicMock()
+    mock_certs_response.json.return_value = {
+        "keys": [{"kty": "RSA", "kid": "key2", "use": "sig", "n": "def", "e": "AQAB"}]
+    }
+    mock_certs_response.raise_for_status = MagicMock()
+
+    # Configure the mock to return the above responses in order
+    mock_httpx_get.side_effect = [mock_oidc_response, mock_certs_response]
+
+    # Initialize mock Redis client
+    mock_redis = AsyncMock(spec=Redis)
+    mock_redis.get = AsyncMock(return_value=None)  # JWKS data not in cache
+    mock_redis.set = AsyncMock()
+
+    # Mock the async context manager (__aenter__ and __aexit__)
+    mock_redis.__aenter__.return_value = mock_redis
+    mock_redis.__aexit__.return_value = AsyncMock()
+
+    # Initialize mock ConnectionPool
+    mock_redis_pool = AsyncMock(spec=ConnectionPool)
+
+    # Patch the Redis class in the UserAuthentication module to return mock_redis
+    with patch("lcfs.services.keycloak.authentication.Redis", return_value=mock_redis):
+        # Initialize UserAuthentication with the mocked ConnectionPool
+        auth_backend = UserAuthentication(
+            redis_pool=mock_redis_pool,
+            session_factory=AsyncMock(),
+            settings=MagicMock(
+                well_known_endpoint="https://example.com/.well-known/openid-configuration"
+            ),
+        )
+
+        # Call refresh_jwk
         await auth_backend.refresh_jwk()
 
+        # Assertions to verify JWKS data was fetched and set correctly
+        expected_jwks = {
+            "keys": [
+                {"kty": "RSA", "kid": "key2", "use": "sig", "n": "def", "e": "AQAB"}
+            ]
+        }
+        assert auth_backend.jwks == expected_jwks
+        assert auth_backend.jwks_uri == "https://example.com/jwks"
+
+        # Verify that Redis `get` was called with "jwks_data"
+        mock_redis.get.assert_awaited_once_with("jwks_data")
+
+        # Verify that the well-known endpoint was called twice
+        assert mock_httpx_get.call_count == 2
+        mock_httpx_get.assert_any_call(
+            "https://example.com/.well-known/openid-configuration"
+        )
+        mock_httpx_get.assert_any_call("https://example.com/jwks")
+
+        # Verify that Redis `set` was called with the correct parameters
+        expected_jwks_data = {
+            "jwks": expected_jwks,
+            "jwks_uri": "https://example.com/jwks",
+        }
+        mock_redis.set.assert_awaited_once_with(
+            "jwks_data", json.dumps(expected_jwks_data), ex=86400
+        )
 
 
 @pytest.mark.anyio