diff --git a/features/reloading.feature b/features/reloading.feature
index f5cc5aa..94477be 100644
--- a/features/reloading.feature
+++ b/features/reloading.feature
@@ -1,22 +1,11 @@
-Feature:
-  When using factory_bot_rails together with Spring
-  I want changes to my application to trigger the factory_bot_rails reloader
-  So that factory_bot_rails doesn't hold onto stale class references
-
-  Scenario: Editing a model without editing the factory
+Feature: automatically reloading factory_bot definitions
+  Background:
     When I create a new rails application
     And I add "factory_bot_rails" from this project as a dependency
     And I run `bundle install` with a clean environment
     And I write to "db/migrate/1_create_users.rb" with:
       """
-      migration_class =
-        if ActiveRecord::Migration.respond_to?(:[])
-          ActiveRecord::Migration[4.2]
-        else
-          ActiveRecord::Migration
-        end
-
-      class CreateUsers < migration_class
+      class CreateUsers < ActiveRecord::Migration[5.0]
         def self.up
           create_table :users do |t|
             t.string :name
@@ -25,7 +14,12 @@ Feature:
       end
       """
     And I run `bundle exec rake db:migrate` with a clean environment
-    And I write to "app/models/user.rb" with:
+
+  Scenario: When using factory_bot_rails together with Spring
+    I want changes to my application to trigger the factory_bot_rails reloader
+    So that factory_bot_rails doesn't hold onto stale class references
+
+    When I write to "app/models/user.rb" with:
       """
       class User < ActiveRecord::Base
       end
@@ -43,7 +37,7 @@ Feature:
       require 'test_helper'
 
       class UserTest < ActiveSupport::TestCase
-        test "use factory" do
+        test "user factory" do
           author = FactoryBot.create(:author)
 
           assert_equal author.class.object_id, User.object_id
@@ -62,27 +56,28 @@ Feature:
     Then the output should contain "1 runs, 1 assertions"
     And the output should not contain "Failure:"
 
-Scenario: Initializing the reloader with I18n support
-    When I create a new rails application
-    And I add "factory_bot_rails" from this project as a dependency
-    And I run `bundle install` with a clean environment
-    And I run `bundle exec rake db:migrate` with a clean environment
-    And I write to "app/models/user.rb" with:
+  Scenario: When using factory_bot_rails together with Spring
+    I want changes to my factory_bot definitions to trigger a reload
+    So that I can use my updated definitions without stopping spring
+
+    When I write to "app/models/user.rb" with:
       """
-      class User
-        TRANSLATION = I18n.translate("translation_key")
+      class User < ActiveRecord::Base
       end
       """
-    And I write to "config/locales/en.yml" with:
-      """
-        en:
-          translation_key: "translation_value"
-      """
     And I write to "test/factories.rb" with:
+      """
+      # Empty definition file to be picked up by the file watcher
+
+      """
+    And I run `bundle binstubs bundler rake spring --force` with a clean environment
+    And I run `bin/spring binstub --all` with a clean environment
+    And I run `bin/rake test` with Spring enabled
+    And I append to "test/factories.rb" with:
       """
       FactoryBot.define do
-        factory :user do
-          User::TRANSLATION
+        factory :author, class: User do
+          name { "Frank" }
         end
       end
       """
@@ -91,13 +86,50 @@ Scenario: Initializing the reloader with I18n support
       require 'test_helper'
 
       class UserTest < ActiveSupport::TestCase
-        test "use factory" do
-          user = FactoryBot.build(:user)
+        test "user factory" do
+          author = FactoryBot.create(:author)
 
-          assert_equal "translation_value", User::TRANSLATION
+          assert_equal author.class.object_id, User.object_id
         end
       end
       """
-    And I run `bundle exec rake test` with a clean environment
+    And I run `bin/rake test` with Spring enabled
+    And I run `spring stop` with a clean environment
     Then the output should contain "1 runs, 1 assertions"
     And the output should not contain "Failure:"
+
+  Scenario: Initializing the reloader with I18n support
+      When I write to "app/models/user.rb" with:
+        """
+        class User
+          TRANSLATION = I18n.translate("translation_key")
+        end
+        """
+      And I write to "config/locales/en.yml" with:
+        """
+          en:
+            translation_key: "translation_value"
+        """
+      And I write to "test/factories.rb" with:
+        """
+        FactoryBot.define do
+          factory :user do
+            User::TRANSLATION
+          end
+        end
+        """
+      And I write to "test/unit/user_test.rb" with:
+        """
+        require 'test_helper'
+
+        class UserTest < ActiveSupport::TestCase
+          test "eser factory" do
+            user = FactoryBot.build(:user)
+
+            assert_equal "translation_value", User::TRANSLATION
+          end
+        end
+        """
+      And I run `bundle exec rake test` with a clean environment
+      Then the output should contain "1 runs, 1 assertions"
+      And the output should not contain "Failure:"