diff --git a/ietf/meeting/test_data.py b/ietf/meeting/test_data.py
new file mode 100644
index 000000000..ff92707e7
--- /dev/null
+++ b/ietf/meeting/test_data.py
@@ -0,0 +1,55 @@
+import datetime
+
+from ietf.utils.test_data import make_test_data
+from ietf.meeting.models import Meeting, Room, TimeSlot, Session, Schedule, ScheduledSession
+from ietf.person.models import Person
+from ietf.doc.models import Document, State
+from ietf.group.models import Group
+
+
+def make_meeting_test_data():
+ make_test_data()
+ system_person = Person.objects.get(name="(System)")
+ plainman = Person.objects.get(user__username="plain")
+
+ meeting = Meeting.objects.get(number="42", type="ietf")
+ schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-agenda", visible=True, public=True)
+ room = Room.objects.create(meeting=meeting, name="Test Room", capacity=123)
+
+ # mars WG
+ slot = TimeSlot.objects.create(meeting=meeting, type_id="session", duration=30 * 60, location=room,
+ time=datetime.datetime.combine(datetime.date.today(), datetime.time(9, 30)))
+ mars_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="mars"),
+ attendees=10, requested_by=system_person,
+ requested_duration=20, status_id="sched",
+ scheduled=datetime.datetime.now())
+ ScheduledSession.objects.create(timeslot=slot, session=mars_session, schedule=schedule)
+
+ # ames WG
+ slot = TimeSlot.objects.create(meeting=meeting, type_id="session", duration=30 * 60, location=room,
+ time=datetime.datetime.combine(datetime.date.today(), datetime.time(10, 30)))
+ ames_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="ames"),
+ attendees=10, requested_by=system_person,
+ requested_duration=20, status_id="sched",
+ scheduled=datetime.datetime.now())
+ ScheduledSession.objects.create(timeslot=slot, session=ames_session, schedule=schedule)
+
+ meeting.agenda = schedule
+ meeting.save()
+
+ doc = Document.objects.create(name='agenda-mars-ietf-42', type_id='agenda', title="Agenda", external_url="agenda-mars")
+ doc.set_state(State.objects.get(type=doc.type_id, slug="active"))
+ mars_session.materials.add(doc)
+
+ doc = Document.objects.create(name='minutes-mars-ietf-42', type_id='minutes', title="Minutes", external_url="minutes-mars")
+ doc.set_state(State.objects.get(type=doc.type_id, slug="active"))
+ mars_session.materials.add(doc)
+
+ doc = Document.objects.create(name='slides-mars-ietf-42', type_id='slides', title="Slideshow", external_url="slides-mars")
+ doc.set_state(State.objects.get(type=doc.type_id, slug="active"))
+ mars_session.materials.add(doc)
+
+ return meeting
+
+
+
diff --git a/ietf/meeting/tests/__init__.py b/ietf/meeting/tests/__init__.py
deleted file mode 100644
index af03b672c..000000000
--- a/ietf/meeting/tests/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright The IETF Trust 2012, All Rights Reserved
-
-"""
-The test cases are split into multiple files.
-"""
-
-# actual tests are distributed among a set of files in subdir tests/
-from ietf.meeting.tests.meetingurls import MeetingUrlTestCase
-from ietf.meeting.tests.agenda import AgendaInfoTestCase
-from ietf.meeting.tests.api import ApiTestCase
-from ietf.meeting.tests.edit import EditTestCase
-from ietf.meeting.tests.auths import AuthDataTestCase
-from ietf.meeting.tests.view import ViewTestCase
-from ietf.meeting.tests.urlgen import UrlGenTestCase
-
-
diff --git a/ietf/meeting/tests/agenda-83-utc.html.good b/ietf/meeting/tests/agenda-83-utc.html.good
deleted file mode 100644
index aed281b41..000000000
--- a/ietf/meeting/tests/agenda-83-utc.html.good
+++ /dev/null
@@ -1,12146 +0,0 @@
-
-
-
-
-
-
-IETF 83 Meeting Agenda - DEVELOPMENT MODE
-IETF 83 Meeting Agenda - DEVELOPMENT MODE
-
datatracker.ietf.org - DEVELOPMENT MODE
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
-