diff --git a/atst/domain/environments.py b/atst/domain/environments.py
index aeba40d2..44eaad9a 100644
--- a/atst/domain/environments.py
+++ b/atst/domain/environments.py
@@ -5,7 +5,6 @@ from atst.database import db
 from atst.models.environment import Environment
 from atst.models.environment_role import EnvironmentRole
 from atst.models.application import Application
-from atst.domain.application_roles import ApplicationRoles
 from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.users import Users
 
@@ -33,9 +32,6 @@ class Environments(object):
 
     @classmethod
     def add_member(cls, environment, user, role):
-        ApplicationRoles.create(
-            user=user, application=environment.application, permission_set_names=[]
-        )
         environment_user = EnvironmentRoles.create(
             user=user, environment=environment, role=role
         )
diff --git a/tests/models/test_environments.py b/tests/models/test_environments.py
index bccfdb94..a3c6deee 100644
--- a/tests/models/test_environments.py
+++ b/tests/models/test_environments.py
@@ -1,4 +1,5 @@
 from atst.models import AuditEvent
+from atst.models.environment_role import CSPRole
 from atst.domain.environments import Environments
 from atst.domain.applications import Applications
 
@@ -7,6 +8,7 @@ from tests.factories import (
     UserFactory,
     EnvironmentFactory,
     ApplicationFactory,
+    ApplicationRoleFactory,
 )
 
 
@@ -20,7 +22,10 @@ def test_add_user_to_environment():
     )
     dev_environment = application.environments[0]
 
-    dev_environment = Environments.add_member(dev_environment, developer, "developer")
+    ApplicationRoleFactory.create(user=developer, application=application)
+    dev_environment = Environments.add_member(
+        dev_environment, developer, CSPRole.BASIC_ACCESS.value
+    )
     assert developer in dev_environment.users
 
 
diff --git a/tests/models/test_portfolio_role.py b/tests/models/test_portfolio_role.py
index a0af25e5..110df0eb 100644
--- a/tests/models/test_portfolio_role.py
+++ b/tests/models/test_portfolio_role.py
@@ -10,6 +10,7 @@ from atst.models.portfolio_role import Status
 from atst.models.invitation import Status as InvitationStatus
 from atst.models.audit_event import AuditEvent
 from atst.models.portfolio_role import Status as PortfolioRoleStatus
+from atst.models.environment_role import CSPRole
 from tests.factories import (
     UserFactory,
     InvitationFactory,
@@ -180,8 +181,9 @@ def test_has_environment_roles():
     application = Applications.create(
         portfolio, "my test application", "It's mine.", ["dev", "staging", "prod"]
     )
+    ApplicationRoleFactory.create(user=portfolio_role.user, application=application)
     Environments.add_member(
-        application.environments[0], portfolio_role.user, "developer"
+        application.environments[0], portfolio_role.user, CSPRole.BASIC_ACCESS.value
     )
     assert portfolio_role.has_environment_roles