diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index c5cb7b2d09f6a4b3bde0e2e26d4f2bf16afd015a..0cf39636aca9607543afa98e2ab946dfeeb4bf99 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -91,6 +91,8 @@ def initialize
       def method_missing(method, *args)
         method = method.to_s.sub(/=$/, '').to_sym
 
+        return @options[method] if args.empty?
+
         if method == :rails
           namespace, configuration = :rails, args.shift
         elsif args.first.is_a?(Hash)
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index ccf338bb6cc2a0729d298903efef99849ea41c80..421f3df474db7c2d7f009103a915796a0488453b 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -58,6 +58,7 @@ module Generators
         :scaffold_controller => :scaffold_controller,
         :singleton => false,
         :stylesheets => true,
+        :test_framework => nil,
         :template_engine => :erb
       },
 
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 3cd16a69f90e1427327e4b630aa013c4bea892f4..d17be5b96406d572555d6b8ccebc7e90ad19d7ce 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -9,7 +9,7 @@ def self.root
 
 require 'rails/generators'
 require 'rails/generators/test_case'
-
+Rails::Generators.configure!
 require 'active_record'
 require 'action_dispatch'