2 files changed, 3 insertions, 5 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index c6aea03d8c..076c5b3bbd 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -110,7 +110,6 @@ module ApplicationTests
       app_name = File.basename(app_path)
       app_dir = File.dirname(app_path)
       moved_app_name = app_name + '_moved'
-      moved_app_path = "#{app_path}/#{moved_app_name}"
 
       Dir.chdir(app_dir) do
         # Go from "./app/" to "./app/app_moved"
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 9e7626647e..db268ed6f2 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -6,13 +6,15 @@ require 'rails/generators/mailer/mailer_generator'
 require 'rails/generators/rails/scaffold/scaffold_generator'
 
 class NamespacedGeneratorTestCase < Rails::Generators::TestCase
+  include GeneratorsTestHelper
+
   def setup
+    super
     Rails::Generators.namespace = TestApp
   end
 end
 
 class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
-  include GeneratorsTestHelper
   arguments %w(Account foo bar)
   tests Rails::Generators::ControllerGenerator
 
@@ -81,7 +83,6 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
 end
 
 class NamespacedModelGeneratorTest < NamespacedGeneratorTestCase
-  include GeneratorsTestHelper
   arguments %w(Account name:string age:integer)
   tests Rails::Generators::ModelGenerator
 
@@ -142,7 +143,6 @@ class NamespacedModelGeneratorTest < NamespacedGeneratorTestCase
 end
 
 class NamespacedObserverGeneratorTest < NamespacedGeneratorTestCase
-  include GeneratorsTestHelper
   arguments %w(account)
   tests Rails::Generators::ObserverGenerator
 
@@ -163,7 +163,6 @@ class NamespacedObserverGeneratorTest < NamespacedGeneratorTestCase
 end
 
 class NamespacedMailerGeneratorTest < NamespacedGeneratorTestCase
-  include GeneratorsTestHelper
   arguments %w(notifier foo bar)
   tests Rails::Generators::MailerGenerator