diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 2366d0bd..44a9a8d0 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -174,6 +174,18 @@ def create_course_session_assignment(course_session, assignment):
         course_session=course_session,
         learning_content=assignment,
     )
+
+    if course_session.start_date is None:
+        course_session.start_date = datetime.now() + timedelta(days=12)
+        course_session.save()
+    submission_deadline = csa.submission_deadline
+    if submission_deadline:
+        submission_deadline.end = course_session.start_date + timedelta(days=14)
+        submission_deadline.save()
+    evaluation_deadline = csa.evaluation_deadline
+    if evaluation_deadline:
+        evaluation_deadline.end = course_session.start_date + timedelta(days=28)
+        evaluation_deadline.save()
     return csa