diff --git a/config/environment.rb b/config/environment.rb
index 4d19868a..19c69a79 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -16,9 +16,6 @@ Rails::Initializer.run do |config|
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
 
-  # Make Active Record use UTC-base instead of local time
-  config.active_record.default_timezone = :utc
-  
   # Use Active Record's schema dumper instead of SQL when creating the test database
   # (enables use of different database adapters for development and test environments)
   config.active_record.schema_format = :ruby
diff --git a/test/functional/file_controller_test.rb b/test/functional/file_controller_test.rb
index 102ff8d5..24fc2125 100755
--- a/test/functional/file_controller_test.rb
+++ b/test/functional/file_controller_test.rb
@@ -3,6 +3,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'file_controller'
 require 'fileutils'
+require 'stringio'
 
 # Raise errors beyond the default web-based presentation
 class FileController; def rescue_action(e) logger.error(e); raise e end; end