diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index a9f2180196ac6bc62e5eaa2211e8d842e58a5ad1..a296473632c58b48750e1ebc16cc3a5a8e6abb5b 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -55,7 +55,7 @@ def find(dirs=%w(app config lib script test))
 
   # Returns a hash that maps filenames under +dir+ (recursively) to arrays
   # with their annotations. Only files with annotations are included, and only
-  # those with extension +.builder+, +.rb+, and +.erb+
+  # those with extension +.builder+, +.rb+, +.erb+, +.haml+ and +.slim+
   # are taken into account.
   def find_in(dir)
     results = {}
@@ -69,6 +69,10 @@ def find_in(dir)
         results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/))
       elsif item =~ /\.erb$/
         results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/))
+      elsif item =~ /\.haml$/
+        results.update(extract_annotations_from(item, /-\s*#\s*(#{tag}):?\s*(.*)$/))
+      elsif item =~ /\.slim$/
+        results.update(extract_annotations_from(item, /\/\s*\s*(#{tag}):?\s*(.*)$/))
       end
     end
 
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4ec6f1b67cd800e858a4f4f81186fd58a04919f7
--- /dev/null
+++ b/railties/test/application/rake/migrations_test.rb
@@ -0,0 +1,85 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+  module RakeTests
+    class RakeMigrationsTest < Test::Unit::TestCase
+      def setup
+        build_app
+        boot_rails
+        FileUtils.rm_rf("#{app_path}/config/environments")
+      end
+
+      def teardown
+        teardown_app
+      end
+      
+      test 'model and migration generator with change syntax' do
+         Dir.chdir(app_path) do
+           `rails generate model user username:string password:string`
+           `rails generate migration add_email_to_users email:string`
+         end
+
+         output = Dir.chdir(app_path){ `rake db:migrate` }
+         assert_match(/create_table\(:users\)/, output)
+         assert_match(/CreateUsers: migrated/, output)
+         assert_match(/add_column\(:users, :email, :string\)/, output)
+         assert_match(/AddEmailToUsers: migrated/, output)
+
+         output = Dir.chdir(app_path){ `rake db:rollback STEP=2` }
+         assert_match(/drop_table\("users"\)/, output)
+         assert_match(/CreateUsers: reverted/, output)
+         assert_match(/remove_column\("users", :email\)/, output)
+         assert_match(/AddEmailToUsers: reverted/, output)
+       end
+
+       test 'migration status when schema migrations table is not present' do
+         output = Dir.chdir(app_path){ `rake db:migrate:status` }
+         assert_equal "Schema migrations table does not exist yet.\n", output
+       end
+
+       test 'test migration status' do
+         Dir.chdir(app_path) do
+           `rails generate model user username:string password:string`
+           `rails generate migration add_email_to_users email:string`
+         end
+
+         Dir.chdir(app_path) { `rake db:migrate`}
+         output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+         assert_match(/up\s+\d{14}\s+Create users/, output)
+         assert_match(/up\s+\d{14}\s+Add email to users/, output)
+
+         Dir.chdir(app_path) { `rake db:rollback STEP=1` }
+         output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+         assert_match(/up\s+\d{14}\s+Create users/, output)
+         assert_match(/down\s+\d{14}\s+Add email to users/, output)
+       end
+
+       test 'test migration status after rollback and redo' do
+         Dir.chdir(app_path) do
+           `rails generate model user username:string password:string`
+           `rails generate migration add_email_to_users email:string`
+         end
+
+         Dir.chdir(app_path) { `rake db:migrate`}
+         output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+         assert_match(/up\s+\d{14}\s+Create users/, output)
+         assert_match(/up\s+\d{14}\s+Add email to users/, output)
+
+         Dir.chdir(app_path) { `rake db:rollback STEP=2` }
+         output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+         assert_match(/down\s+\d{14}\s+Create users/, output)
+         assert_match(/down\s+\d{14}\s+Add email to users/, output)
+
+         Dir.chdir(app_path) { `rake db:migrate:redo` }
+         output = Dir.chdir(app_path) { `rake db:migrate:status` }
+
+         assert_match(/up\s+\d{14}\s+Create users/, output)
+         assert_match(/up\s+\d{14}\s+Add email to users/, output)
+       end
+    end
+  end
+end
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..659cbfec0fa1899976a6bf490e6b5324d5dcd663
--- /dev/null
+++ b/railties/test/application/rake/notes_test.rb
@@ -0,0 +1,45 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+  module RakeTests
+    class RakeNotesTest < Test::Unit::TestCase
+      def setup 
+        build_app
+        require "rails/all"
+      end
+    
+      def teardown
+        teardown_app
+      end
+
+      test 'notes' do
+
+        app_file "app/views/home/index.html.erb", "<% # TODO: note in erb %>"
+        app_file "app/views/home/index.html.haml", "-# TODO: note in haml"
+        app_file "app/views/home/index.html.slim", "/ TODO: note in slim"
+
+        boot_rails
+        require 'rake'
+        require 'rdoc/task'
+        require 'rake/testtask'
+
+        Rails.application.load_tasks
+   
+        Dir.chdir(app_path) do
+          output = `bundle exec rake notes`
+        
+          assert_match /note in erb/, output
+          assert_match /note in haml/, output
+          assert_match /note in slim/, output
+        end
+      
+      end
+    
+      private
+      def boot_rails
+        super
+        require "#{app_path}/config/environment"
+      end
+    end
+  end
+end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index c76bc3d526980ceee35d1c569b684ba8c09974ae..4e406f23d2b64cb159c3d8bb6a9aa235a51ae7fc 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -108,74 +108,6 @@ def test_logger_is_flushed_when_exiting_production_rake_tasks
       assert_match "Sample log message", output
     end
 
-    def test_model_and_migration_generator_with_change_syntax
-      Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
-      end
-
-      output = Dir.chdir(app_path){ `rake db:migrate` }
-      assert_match(/create_table\(:users\)/, output)
-      assert_match(/CreateUsers: migrated/, output)
-      assert_match(/add_column\(:users, :email, :string\)/, output)
-      assert_match(/AddEmailToUsers: migrated/, output)
-
-      output = Dir.chdir(app_path){ `rake db:rollback STEP=2` }
-      assert_match(/drop_table\("users"\)/, output)
-      assert_match(/CreateUsers: reverted/, output)
-      assert_match(/remove_column\("users", :email\)/, output)
-      assert_match(/AddEmailToUsers: reverted/, output)
-    end
-
-    def test_migration_status_when_schema_migrations_table_is_not_present
-      output = Dir.chdir(app_path){ `rake db:migrate:status` }
-      assert_equal "Schema migrations table does not exist yet.\n", output
-    end
-
-    def test_migration_status
-      Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
-      end
-
-      Dir.chdir(app_path) { `rake db:migrate`}
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
-
-      Dir.chdir(app_path) { `rake db:rollback STEP=1` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/down\s+\d{14}\s+Add email to users/, output)
-    end
-
-    def test_migration_status_after_rollback_and_redo
-      Dir.chdir(app_path) do
-        `rails generate model user username:string password:string`
-        `rails generate migration add_email_to_users email:string`
-      end
-
-      Dir.chdir(app_path) { `rake db:migrate`}
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
-
-      Dir.chdir(app_path) { `rake db:rollback STEP=2` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/down\s+\d{14}\s+Create users/, output)
-      assert_match(/down\s+\d{14}\s+Add email to users/, output)
-
-      Dir.chdir(app_path) { `rake db:migrate:redo` }
-      output = Dir.chdir(app_path) { `rake db:migrate:status` }
-
-      assert_match(/up\s+\d{14}\s+Create users/, output)
-      assert_match(/up\s+\d{14}\s+Add email to users/, output)
-    end
-
     def test_loading_specific_fixtures
       Dir.chdir(app_path) do
         `rails generate model user username:string password:string`