diff --git a/lib/linguist/lazy_blob.rb b/lib/linguist/lazy_blob.rb
index 131cafcf..3ece29f2 100644
--- a/lib/linguist/lazy_blob.rb
+++ b/lib/linguist/lazy_blob.rb
@@ -29,19 +29,19 @@ module Linguist
         name, GIT_ATTR, GIT_ATTR_FLAGS)
     end
 
-    def linguist_vendored?
+    def vendored?
       if git_attributes['linguist-vendored']
         return result_for_key('linguist-vendored')
       else
-        return vendored?
+        return super
       end
     end
 
-    def linguist_generated?
+    def generated?
       if git_attributes['linguist-generated']
         return result_for_key('linguist-generated')
       else
-        return generated?
+        return super
       end
     end
 
diff --git a/lib/linguist/repository.rb b/lib/linguist/repository.rb
index ae3dd1f3..f2bcb785 100644
--- a/lib/linguist/repository.rb
+++ b/lib/linguist/repository.rb
@@ -142,7 +142,7 @@ module Linguist
           blob = Linguist::LazyBlob.new(repository, delta.new_file[:oid], new, mode.to_s(8))
 
           # Skip vendored or generated blobs
-          next if blob.linguist_vendored? || blob.linguist_generated? || blob.language.nil?
+          next if blob.vendored? || blob.generated? || blob.language.nil?
 
           # Only include programming languages and acceptable markup languages
           if blob.language.type == :programming || Language.detectable_markup.include?(blob.language.name)
diff --git a/test/test_repository.rb b/test/test_repository.rb
index d2ce510a..dbd7e3a9 100644
--- a/test/test_repository.rb
+++ b/test/test_repository.rb
@@ -69,7 +69,7 @@ class TestRepository < Test::Unit::TestCase
   end
 
 
-  def test_linguist_generated?
+  def test_linguist_override_generated?
     attr_commit = 'b533b682d5d4012ca42f4fc998b45169ec41fe33'
 
     file = Linguist::LazyBlob.new(rugged_repository, attr_commit, 'Rakefile')
@@ -84,9 +84,7 @@ class TestRepository < Test::Unit::TestCase
     # check we're getting the correct assignment back from .gitattributes
     assert file.result_for_key('linguist-generated')
     # overridden in .gitattributes
-    assert file.linguist_generated?
-    # from lib/linguist/generated.rb
-    assert !file.generated?
+    assert file.generated?
   end
 
   def test_linguist_override_vendored?
@@ -103,9 +101,7 @@ class TestRepository < Test::Unit::TestCase
     # check we're getting the correct assignment back from .gitattributes
     assert override_vendored.result_for_key('linguist-vendored')
     # overridden .gitattributes
-    assert override_vendored.linguist_vendored?
-    # from lib/linguist/vendor.yml
-    assert !override_vendored.vendored?
+    assert override_vendored.vendored?
   end
 
   def test_linguist_override_unvendored?
@@ -124,8 +120,6 @@ class TestRepository < Test::Unit::TestCase
     # check we're getting the correct assignment back from .gitattributes
     assert !override_unvendored.result_for_key('linguist-vendored')
     # overridden .gitattributes
-    assert !override_unvendored.linguist_vendored?
-    # from lib/linguist/vendor.yml
-    assert override_unvendored.vendored?
+    assert !override_unvendored.vendored?
   end
 end