diff --git a/CHANGELOG b/CHANGELOG
index a9ae99d1753..d79fd21d3db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 = ActiveMerchant CHANGELOG
 
+* Add Discover to the list of supported card types for Braintree [cody]
 * Add support for Modern Payments gateway [Jeremy Nicoll, cody]
 * Add support for EFT/ACH and Interac Online to the BeanstreamGateway [cody]
 * Document the SageGateway [cody]
diff --git a/lib/active_merchant/billing/gateways/braintree.rb b/lib/active_merchant/billing/gateways/braintree.rb
index 1037a7a085a..bca47dd370d 100644
--- a/lib/active_merchant/billing/gateways/braintree.rb
+++ b/lib/active_merchant/billing/gateways/braintree.rb
@@ -6,7 +6,7 @@ class BraintreeGateway < Gateway
       URL = 'https://secure.braintreepaymentgateway.com/api/transact.php'
     
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.homepage_url = 'http://www.braintreepaymentsolutions.com'
       self.display_name = 'Braintree'
 
diff --git a/test/unit/gateways/braintree_test.rb b/test/unit/gateways/braintree_test.rb
index dfa0be448f7..49945f0a3dd 100644
--- a/test/unit/gateways/braintree_test.rb
+++ b/test/unit/gateways/braintree_test.rb
@@ -8,10 +8,7 @@ def setup
       :password => 'PASSWORD'
     )
 
-    @credit_card = credit_card('4242424242424242',
-                    :type => 'visa'
-                  )
-    
+    @credit_card = credit_card
     @amount = 100
     
     @options = { :billing_address => address }
@@ -50,7 +47,7 @@ def test_supported_countries
   end
 
   def test_supported_card_types
-    assert_equal [:visa, :master, :american_express], BraintreeGateway.supported_cardtypes
+    assert_equal [:visa, :master, :american_express, :discover], BraintreeGateway.supported_cardtypes
   end
   
   def test_adding_store_adds_vault_id_flag