2 files changed, 6 insertions, 12 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 6289d4cc46..d1e445ac70 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -77,17 +77,7 @@ module Rails
     end
 
     def middleware
-      middlewares = []
-
-      # FIXME: add Rack::Lock in the case people are using webrick.
-      # This is to remain backwards compatible for those who are
-      # running webrick in production. We should consider removing this
-      # in development.
-      if server.name == 'Rack::Handler::WEBrick'
-        middlewares << [::Rack::Lock]
-      end
-
-      Hash.new(middlewares)
+      Hash.new([])
     end
 
     def default_options
diff --git a/railties/lib/rails/commands/test.rb b/railties/lib/rails/commands/test.rb
index fe5307788a..dd069f081f 100644
--- a/railties/lib/rails/commands/test.rb
+++ b/railties/lib/rails/commands/test.rb
@@ -1,5 +1,9 @@
 require "rails/test_unit/minitest_plugin"
 
-$: << File.expand_path("../../test", APP_PATH)
+if defined?(ENGINE_ROOT)
+  $: << File.expand_path('test', ENGINE_ROOT)
+else
+  $: << File.expand_path('../../test', APP_PATH)
+end
 
 exit Minitest.run(ARGV)