diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 3dbc4fd6..e56f0c37 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1482,7 +1482,7 @@ Xtend:
   primary_extension: .xtend
 
 YAML:
-  type: markup
+  type: data
   aliases:
   - yml
   primary_extension: .yml
diff --git a/test/test_language.rb b/test/test_language.rb
index 40e03c62..413a015d 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -191,7 +191,6 @@ class TestLanguage < Test::Unit::TestCase
 
   def test_markup
     assert_equal :markup, Language['HTML'].type
-    assert_equal :markup, Language['YAML'].type
   end
 
   def test_other