diff --git a/lib/faker/business.rb b/lib/faker/business.rb
index e27c8c1db8..4b5385789f 100644
--- a/lib/faker/business.rb
+++ b/lib/faker/business.rb
@@ -10,7 +10,7 @@ def credit_card_number
       end
 
       def credit_card_expiry_date
-        ::Date.parse(fetch('business.credit_card_expiry_dates'))
+        ::Date.today + (365 * (rand(4) + 1))
       end
 
       def credit_card_type
diff --git a/test/test_faker_business.rb b/test/test_faker_business.rb
index 1272d6f13b..90aaea2fb0 100644
--- a/test/test_faker_business.rb
+++ b/test/test_faker_business.rb
@@ -5,29 +5,30 @@ class TestFakerBusiness < Test::Unit::TestCase
   def setup
     @tester = Faker::Business
     @credit_card_number_list = I18n.translate('faker.business.credit_card_numbers')
-    @credit_card_number_expiry_dates = I18n.translate('faker.business.credit_card_expiry_dates')
     @credit_card_types = I18n.translate('faker.business.credit_card_types')
+    @minimum_expiry_date = ::Date.today + 365
+    @maximum_expiry_date = ::Date.today + (365 * 4)
   end
 
   def test_credit_card_number
     number1 = @tester.credit_card_number
     number2 = @tester.credit_card_number
-    assert @credit_card_number_list.include?(number1) 
-    assert @credit_card_number_list.include?(number2) 
+    assert @credit_card_number_list.include?(number1)
+    assert @credit_card_number_list.include?(number2)
   end
-  
+
   def test_credit_card_expiry_date
     date1 = @tester.credit_card_expiry_date
     date2 = @tester.credit_card_expiry_date
-    assert @credit_card_number_expiry_dates.collect{|d| Date.parse(d)}.include?(date1) 
-    assert @credit_card_number_expiry_dates.collect{|d| Date.parse(d)}.include?(date2)
+    assert date1.between?(@minimum_expiry_date, @maximum_expiry_date)
+    assert date2.between?(@minimum_expiry_date, @maximum_expiry_date)
   end
-  
+
   def test_credit_card_type
     type1 = @tester.credit_card_type
     type2 = @tester.credit_card_type
-    assert @credit_card_types.include?(type1) 
-    assert @credit_card_types.include?(type2) 
+    assert @credit_card_types.include?(type1)
+    assert @credit_card_types.include?(type2)
   end
-  
+
 end