diff --git a/atst/jobs.py b/atst/jobs.py
index c2e2d03e..6a91b03e 100644
--- a/atst/jobs.py
+++ b/atst/jobs.py
@@ -119,7 +119,7 @@ def do_create_environment(csp: CloudProviderInterface, environment_id=None):
         parent_id = environment.application.cloud_id
         tenant_id = csp_details.get("tenant_id")
         payload = EnvironmentCSPPayload(
-            tenant_id=tenant_id, display_name=application.name, parent_id=parent_id
+            tenant_id=tenant_id, display_name=environment.name, parent_id=parent_id
         )
 
         env_result = csp.create_environment(payload)
diff --git a/tests/domain/cloud/test_mock_csp.py b/tests/domain/cloud/test_mock_csp.py
index b3a8d551..86727b38 100644
--- a/tests/domain/cloud/test_mock_csp.py
+++ b/tests/domain/cloud/test_mock_csp.py
@@ -1,6 +1,7 @@
 import pytest
 
 from atst.domain.csp import MockCloudProvider
+from atst.domain.csp.cloud.models import EnvironmentCSPPayload, EnvironmentCSPResult
 
 from tests.factories import EnvironmentFactory, EnvironmentRoleFactory, UserFactory
 
@@ -14,9 +15,17 @@ def mock_csp():
 
 def test_create_environment(mock_csp: MockCloudProvider):
     environment = EnvironmentFactory.create()
-    user = UserFactory.create()
-    environment_id = mock_csp.create_environment(CREDENTIALS, user, environment)
-    assert isinstance(environment_id, str)
+    environment.application.cloud_id = "parent_id"
+    environment.application.portfolio.csp_data = {"tenant_id": "fake"}
+    payload = EnvironmentCSPPayload(
+        **dict(
+            tenant_id=environment.application.portfolio.csp_data.get("tenant_id"),
+            display_name=environment.name,
+            parent_id=environment.application.cloud_id,
+        )
+    )
+    result = mock_csp.create_environment(payload)
+    assert isinstance(result, EnvironmentCSPResult)
 
 
 def test_create_admin_user(mock_csp: MockCloudProvider):
diff --git a/tests/test_jobs.py b/tests/test_jobs.py
index 54f4c5dc..de17eb6a 100644
--- a/tests/test_jobs.py
+++ b/tests/test_jobs.py
@@ -94,6 +94,10 @@ tomorrow = now.add(days=1)
 
 def test_create_environment_job(session, csp):
     environment = EnvironmentFactory.create()
+    environment.application.cloud_id = "parentId"
+    environment.application.portfolio.csp_data = {"tenant_id": "fake"}
+    session.add(environment)
+    session.commit()
     do_create_environment(csp, environment.id)
     session.refresh(environment)