diff --git a/tests/routes/task_orders/test_new_task_order.py b/tests/routes/task_orders/test_new_task_order.py
index 53374ed6..c8fcaf75 100644
--- a/tests/routes/task_orders/test_new_task_order.py
+++ b/tests/routes/task_orders/test_new_task_order.py
@@ -76,6 +76,49 @@ def test_create_new_task_order(client, user_session):
     )
     assert url_for("task_orders.new", screen=4) in response.headers["Location"]
 
+def test_create_new_task_order_on_funding_screen(client, user_session):
+    creator = UserFactory.create()
+    user_session(creator)
+
+    task_order_data = TaskOrderFactory.dictionary()
+    app_info_data = slice_data_for_section(task_order_data, "app_info")
+    portfolio_name = "Mos Eisley"
+    app_info_data["portfolio_name"] = portfolio_name
+
+    response = client.post(
+        url_for("task_orders.update", screen=2),
+        data=app_info_data,
+        follow_redirects=False,
+    )
+    assert url_for("task_orders.new", screen=3) in response.headers["Location"]
+
+    created_task_order_id = response.headers["Location"].split("/")[-1]
+    created_task_order = TaskOrders.get(creator, created_task_order_id)
+    assert created_task_order.portfolio is not None
+    assert created_task_order.portfolio.name == portfolio_name
+
+def test_create_new_task_order_on_oversight_screen(client, user_session):
+    creator = UserFactory.create()
+    user_session(creator)
+
+    task_order_data = TaskOrderFactory.dictionary()
+    app_info_data = slice_data_for_section(task_order_data, "app_info")
+    portfolio_name = "Mos Eisley"
+    app_info_data["portfolio_name"] = portfolio_name
+
+    response = client.post(
+        url_for("task_orders.update", screen=3),
+        data=app_info_data,
+        follow_redirects=False,
+    )
+    import ipdb; ipdb.set_trace()
+    assert url_for("task_orders.new", screen=4) in response.headers["Location"]
+
+    created_task_order_id = response.headers["Location"].split("/")[-1]
+    created_task_order = TaskOrders.get(creator, created_task_order_id)
+    assert created_task_order.portfolio is not None
+    assert created_task_order.portfolio.name == portfolio_name
+
 
 def test_create_new_task_order_for_portfolio(client, user_session):
     portfolio = PortfolioFactory.create()