diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index b7b158fc..4a068309 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -913,8 +913,8 @@ VimL:
   extensions:
   - .vim
   filenames:
-  - .vimrc
   - .gvimrc
+  - .vimrc
 
 Visual Basic:
   type: programming
diff --git a/test/test_pedantic.rb b/test/test_pedantic.rb
index 5910dabf..d6271dd7 100644
--- a/test/test_pedantic.rb
+++ b/test/test_pedantic.rb
@@ -31,6 +31,20 @@ class TestPedantic < Test::Unit::TestCase
     end
   end
 
+  def test_filenames_are_sorted
+    filenames = nil
+    file("languages.yml").lines.each do |line|
+      if line =~ /^  filenames:$/
+        filenames = []
+      elsif filenames && line =~ /^  - \.(\w+)$/
+        filenames << $1
+      else
+        assert_sorted filenames if filenames
+        filenames = nil
+      end
+    end
+  end
+
   def assert_sorted(list)
     previous = nil
     list.each do |item|