diff --git a/src/registrar/context_processors.py b/src/registrar/context_processors.py
index 840df7389..f9a8d328d 100644
--- a/src/registrar/context_processors.py
+++ b/src/registrar/context_processors.py
@@ -76,16 +76,15 @@ def portfolio_permissions(request):
     }
     try:
         portfolio = request.session.get("portfolio")
+        # Linting: line too long
+        view_suborg = request.user.has_view_suborganization_portfolio_permission(portfolio)
+        edit_suborg = request.user.has_edit_suborganization_portfolio_permission(portfolio)
         if portfolio:
             return {
                 "has_base_portfolio_permission": request.user.has_base_portfolio_permission(portfolio),
                 "has_edit_request_portfolio_permission": request.user.has_edit_request_portfolio_permission(portfolio),
-                "has_view_suborganization_portfolio_permission": request.user.has_view_suborganization_portfolio_permission(
-                    portfolio
-                ),
-                "has_edit_suborganization_portfolio_permission": request.user.has_edit_suborganization_portfolio_permission(
-                    portfolio
-                ),
+                "has_view_suborganization_portfolio_permission": view_suborg,
+                "has_edit_suborganization_portfolio_permission": edit_suborg,
                 "has_any_domains_portfolio_permission": request.user.has_any_domains_portfolio_permission(portfolio),
                 "has_any_requests_portfolio_permission": request.user.has_any_requests_portfolio_permission(portfolio),
                 "has_view_members_portfolio_permission": request.user.has_view_members_portfolio_permission(portfolio),
diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py
index 7d97f7add..6207591ba 100644
--- a/src/registrar/registrar_middleware.py
+++ b/src/registrar/registrar_middleware.py
@@ -6,7 +6,7 @@ import logging
 from urllib.parse import parse_qs
 from django.urls import reverse
 from django.http import HttpResponseRedirect
-from registrar.models import User, Portfolio
+from registrar.models import User
 from waffle.decorators import flag_is_active
 
 from registrar.models.utility.generic_helper import replace_url_queryparams
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 70a1269fe..069ff8785 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -2,7 +2,6 @@ from django.urls import reverse
 from api.tests.common import less_console_noise_decorator
 from registrar.config import settings
 from registrar.models import Portfolio, SeniorOfficial
-from unittest import skip
 from django_webtest import WebTest  # type: ignore
 from registrar.models import (
     DomainRequest,