diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index 9bfc2b16ab..4cd60fdc39 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -22,7 +22,7 @@ class SourceAnnotationExtractor
     # If +options+ has a flag <tt>:tag</tt> the tag is shown as in the example above.
     # Otherwise the string contains just line and text.
     def to_s(options={})
-      s = "[#{line.to_s.rjust(options[:indent])}]"
+      s = "[#{line.to_s.rjust(options[:indent])}] "
       s << "[#{tag}] " if options[:tag]
       s << text
     end
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index b66433f64d..04abf9e3a1 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -28,7 +28,7 @@ module ApplicationTests
 
         Dir.chdir(app_path) do
           output = `bundle exec rake notes`
-          lines = output.scan(/\[([0-9\s]+)\]/).flatten
+          lines = output.scan(/\[([0-9\s]+)\](\s)/)
 
           assert_match /note in erb/, output
           assert_match /note in haml/, output
@@ -38,8 +38,9 @@ module ApplicationTests
 
           assert_equal 5, lines.size
 
-          lines.each do |line_number|
-            assert_equal 4, line_number.size
+          lines.each do |line|
+            assert_equal 4, line[0].size
+            assert_equal ' ', line[1]
           end
         end