diff --git a/wagtail/tests/migrations/0007_registerdecorator.py b/wagtail/tests/migrations/0007_registerdecorator.py
new file mode 100644
index 000000000..c0f7795b8
--- /dev/null
+++ b/wagtail/tests/migrations/0007_registerdecorator.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tests', '0006_merge'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RegisterDecorator',
+            fields=[
+                ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]
diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index 946f71538..d9a3f56d0 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -497,3 +497,8 @@ class SnippetChooserModel(models.Model):
     panels = [
         SnippetChooserPanel('advert', Advert),
     ]
+
+
+@register_snippet
+class RegisterDecorator(models.Model):
+    pass
diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index 55b79f594..a5f6d3118 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -4,7 +4,7 @@ from django.db import models
 
 from wagtail.tests.utils import WagtailTestUtils
 from django.test.utils import override_settings
-from wagtail.tests.models import Advert, AlphaSnippet, ZuluSnippet, SnippetChooserModel
+from wagtail.tests.models import Advert, AlphaSnippet, ZuluSnippet, SnippetChooserModel, RegisterDecorator
 from wagtail.wagtailsnippets.models import register_snippet, SNIPPET_MODELS
 
 from wagtail.wagtailsnippets.views.snippets import (
@@ -189,9 +189,6 @@ class TestSnippetRegistering(TestCase):
         self.assertIn(RegisterFunction, SNIPPET_MODELS)
 
     def test_register_function(self):
-        @register_snippet
-        class RegisterDecorator(models.Model):
-            pass
 
         # Misbehaving decorators often return None
         self.assertIsNotNone(RegisterDecorator)