diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 3c3d00b9..95c0359f 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -11,18 +11,6 @@
 
 use Carbon\Carbon;
 
-$factory->define('CachetHQ\Cachet\Models\User', function ($faker) {
-    return [
-        'username'       => $faker->userName,
-        'email'          => $faker->email,
-        'password'       => str_random(10),
-        'remember_token' => str_random(10),
-        'api_key'        => str_random(20),
-        'active'         => true,
-        'level'          => 1,
-    ];
-});
-
 $factory->define('CachetHQ\Cachet\Models\Component', function ($faker) {
     return [
         'name'        => $faker->sentence(),
@@ -49,6 +37,17 @@ $factory->define('CachetHQ\Cachet\Models\Incident', function ($faker) {
     ];
 });
 
+$factory->define('CachetHQ\Cachet\Models\IncidentTemplate', function ($faker) {
+    return [
+        'name'     => 'Test Template',
+        'slug'     => 'test-template',
+        'template' => <<<ETEMPLATE
+Name: {{ name }},
+Message: {{ message }}
+ETEMPLATE
+    ];
+});
+
 $factory->define('CachetHQ\Cachet\Models\Metric', function ($faker) {
     return [
         'name'          => $faker->sentence(),
@@ -75,13 +74,14 @@ $factory->define('CachetHQ\Cachet\Models\Subscriber', function ($faker) {
     ];
 });
 
-$factory->define('CachetHQ\Cachet\Models\IncidentTemplate', function ($faker) {
+$factory->define('CachetHQ\Cachet\Models\User', function ($faker) {
     return [
-        'name'     => 'Test Template',
-        'slug'     => 'test-template',
-        'template' => <<<ETEMPLATE
-Name: {{ name }},
-Message: {{ message }}
-ETEMPLATE
+        'username'       => $faker->userName,
+        'email'          => $faker->email,
+        'password'       => str_random(10),
+        'remember_token' => str_random(10),
+        'api_key'        => str_random(20),
+        'active'         => true,
+        'level'          => 1,
     ];
 });