diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 4aa6389a04364fbe78b16b1a53cfb09f8006aea3..16a30e3fdb24c4b456a91ef945014e102ad9ae6b 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -14,6 +14,7 @@
 require 'active_support/core_ext/logger'
 require 'active_support/ordered_hash'
 require 'active_support/core_ext/module/deprecation'
+require 'active_record/fixtures/file'
 
 if defined? ActiveRecord
   class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixtures/file.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9e95007f40c5fcfa551d499a68b8ce34df9c4885
--- /dev/null
+++ b/activerecord/lib/active_record/fixtures/file.rb
@@ -0,0 +1,43 @@
+begin
+  require 'psych'
+rescue LoadError
+end
+
+require 'erb'
+require 'yaml'
+
+module ActiveRecord
+  class Fixtures
+    class File
+      include Enumerable
+
+      ##
+      # Open a fixture file named +file+.  When called with a block, the block
+      # is called with the filehandle and the filehandle is automatically closed
+      # when the block finishes.
+      def self.open(file)
+        x = new file
+        block_given? ? yield(x) : x
+      end
+
+      def initialize(file)
+        @file = file
+        @rows = nil
+      end
+
+      def each(&block)
+        rows.each(&block)
+      end
+
+      private
+      def rows
+        return @rows if @rows
+        @rows = YAML.load(render(IO.read(@file))).to_a
+      end
+
+      def render(content)
+        ERB.new(content).result
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/fixtures/file_test.rb b/activerecord/test/cases/fixtures/file_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..af7a2e5a4e4e84fe503b53e8d73974360398990e
--- /dev/null
+++ b/activerecord/test/cases/fixtures/file_test.rb
@@ -0,0 +1,46 @@
+require "cases/helper"
+require 'tempfile'
+
+module ActiveRecord
+  class Fixtures
+    class FileTest < ActiveRecord::TestCase
+      def test_open
+        fh = File.open(::File.join(FIXTURES_ROOT, "accounts.yml"))
+        assert_equal 6, fh.to_a.length
+      end
+
+      def test_open_with_block
+        called = false
+        File.open(::File.join(FIXTURES_ROOT, "accounts.yml")) do |fh|
+          called = true
+          assert_equal 6, fh.to_a.length
+        end
+        assert called, 'block called'
+      end
+
+      def test_names
+        File.open(::File.join(FIXTURES_ROOT, "accounts.yml")) do |fh|
+          assert_equal ["signals37",
+                        "unknown",
+                        "rails_core_account",
+                        "last_account",
+                        "rails_core_account_2",
+                        "odegy_account"], fh.to_a.map(&:first)
+        end
+      end
+
+      def test_values
+        File.open(::File.join(FIXTURES_ROOT, "accounts.yml")) do |fh|
+          assert_equal [1,2,3,4,5,6], fh.to_a.map(&:last).map { |x| x['id'] }
+        end
+      end
+
+      def test_erb_processing
+        File.open(::File.join(FIXTURES_ROOT, "developers.yml")) do |fh|
+          devs = Array.new(8) { |i| "dev_#{i + 3}" }
+          assert_equal [], devs - fh.to_a.map(&:first)
+        end
+      end
+    end
+  end
+end