diff --git a/atst/routes/requests/jedi_request_flow.py b/atst/routes/requests/jedi_request_flow.py
index e1c646e6..e750a9e0 100644
--- a/atst/routes/requests/jedi_request_flow.py
+++ b/atst/routes/requests/jedi_request_flow.py
@@ -124,5 +124,5 @@ class JEDIRequestFlow(object):
         if self.request_id:
             Requests.update(self.request_id, request_data)
         else:
-            request = Requests.create(self.current_user["id"], request_data)
+            request = Requests.create(self.current_user.id, request_data)
             self.request_id = request.id
diff --git a/tests/factories.py b/tests/factories.py
index d1a129e5..11b11a1b 100644
--- a/tests/factories.py
+++ b/tests/factories.py
@@ -4,6 +4,8 @@ from uuid import uuid4
 from atst.models import Request
 from atst.models.pe_number import PENumber
 from atst.models.task_order import TaskOrder
+from atst.models.user import User
+from atst.models.role import Role
 
 
 class RequestFactory(factory.Factory):
@@ -19,3 +21,20 @@ class PENumberFactory(factory.Factory):
 class TaskOrderFactory(factory.Factory):
     class Meta:
         model = TaskOrder
+
+class RoleFactory(factory.Factory):
+    class Meta:
+        model = Role
+
+    permissions = []
+
+class UserFactory(factory.Factory):
+    class Meta:
+        model = User
+
+    id = factory.Sequence(lambda x: uuid4())
+    email = "fake.user@mail.com"
+    first_name = "Fake"
+    last_name = "User"
+    atat_role = factory.SubFactory(RoleFactory)
+
diff --git a/tests/mocks.py b/tests/mocks.py
index aa6a9ab1..a43ac930 100644
--- a/tests/mocks.py
+++ b/tests/mocks.py
@@ -2,18 +2,12 @@ import tornado.gen
 from tornado.httpclient import HTTPRequest, HTTPResponse
 
 from atst.api_client import ApiClient
-from tests.factories import RequestFactory
+from tests.factories import RequestFactory, UserFactory
 
 
-MOCK_USER = {
-    "id": "9cb348f0-8102-4962-88c4-dac8180c904c",
-    "email": "fake.user@mail.com",
-    "first_name": "Fake",
-    "last_name": "User",
-    "atat_permissions": []
-}
+MOCK_USER = UserFactory.create()
 MOCK_REQUEST = RequestFactory.create(
-    creator=MOCK_USER["id"],
+    creator=MOCK_USER.id,
     body={
         "financial_verification": {
             "pe_id": "0203752A",
diff --git a/tests/routes/test_request_new.py b/tests/routes/test_request_new.py
index 320802b9..0927f1be 100644
--- a/tests/routes/test_request_new.py
+++ b/tests/routes/test_request_new.py
@@ -1,19 +1,11 @@
 import re
 import pytest
 import urllib
-from tests.mocks import MOCK_USER
+from tests.mocks import MOCK_USER, MOCK_REQUEST
 from tests.factories import RequestFactory
 
-ERROR_CLASS = "alert--error"
-MOCK_REQUEST = RequestFactory.create(
-    creator=MOCK_USER["id"],
-    body={
-        "financial_verification": {
-            "pe_id": "0203752A",
-        },
-    }
-)
 
+ERROR_CLASS = "alert--error"
 
 def test_submit_invalid_request_form(monkeypatch, client, user_session):
     user_session()