1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index c8e4d8943b..7c2d8eab67 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -3,6 +3,11 @@ module Rails
     include Initializable
 
     class << self
+      def inherited(klass)
+        Rails.application ||= klass unless klass.name =~ /Rails/
+        super
+      end
+
       # Stub out App initialize
       def initialize!
         new
@@ -33,7 +38,6 @@ module Rails
     end
 
     def initialize
-      Rails.application ||= self
       run_initializers(self)
     end