diff --git a/wagtail/tests/migrations/0005_auto_20141113_0642.py b/wagtail/tests/migrations/0005_auto_20141113_0642.py
index f34f5bd012..37f5744c80 100644
--- a/wagtail/tests/migrations/0005_auto_20141113_0642.py
+++ b/wagtail/tests/migrations/0005_auto_20141113_0642.py
@@ -7,6 +7,7 @@ from django.db import models, migrations
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('wagtailcore', '0002_initial_data'),
         ('tests', '0004_auto_20141008_0420'),
     ]
 
diff --git a/wagtail/tests/migrations/0006_merge.py b/wagtail/tests/migrations/0006_merge.py
new file mode 100644
index 0000000000..7489198a7e
--- /dev/null
+++ b/wagtail/tests/migrations/0006_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tests', '0005_auto_20141113_0642'),
+        ('tests', '0005_auto_20141008_0122'),
+    ]
+
+    operations = [
+    ]