diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 1e0df216..e100e916 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -987,6 +987,12 @@ Tcsh:
   - .csh
   - .tcsh
 
+Tea:
+  type: programming
+  lexer: Java Server Page
+  extensions:
+  - .tea
+
 TeX:
   type: markup
   primary_extension: .tex
diff --git a/test/fixtures/foo.tea b/test/fixtures/foo.tea
new file mode 100644
index 00000000..60285e98
--- /dev/null
+++ b/test/fixtures/foo.tea
@@ -0,0 +1 @@
+<% template foo() %>
\ No newline at end of file
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 9307d165..66012bcb 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -393,6 +393,9 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['CSS'], blob("screen.sass").language.group
     assert_equal Language['SCSS'], blob("screen.scss").language
     assert_equal Language['CSS'], blob("screen.scss").language.group
+
+    # Tea
+    assert_equal Language['Tea'], blob("foo.tea").language
   end
 
   def test_lexer
@@ -402,6 +405,7 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Lexer['Ruby'], blob("grit.rb").lexer
     assert_equal Lexer['Scheme'], blob("dude.el").lexer
     assert_equal Lexer['Text only'], blob("README").lexer
+    assert_equal Lexer['Java Server Page'], blob("foo.tea").lexer
   end
 
   def test_shebang_script