diff --git a/app/views/payments/_payment.html.haml b/app/views/payments/_payment.html.haml
index c0f47e38..da08a240 100644
--- a/app/views/payments/_payment.html.haml
+++ b/app/views/payments/_payment.html.haml
@@ -1,27 +1,27 @@
 = semantic_form_for(@payment, url: conference_payments_path) do |f|
   .form-group
     = f.label :first_name, 'First name(as on card)'
-    = f.text_field :first_name, class: "form-control", placeholder: "John"
+    = f.text_field :first_name, class: "form-control", placeholder: "John", id: "first_name"
   .form-group
     = f.label :last_name, 'Last name(as on card)'
-    = f.text_field :last_name,class: "form-control", placeholder: "Doe"
+    = f.text_field :last_name,class: "form-control", placeholder: "Doe", id: "last_name"
   %span.pull-right
     %img.img-responsive{:src => image_url('credit_card.png')}
   .form-group
     = f.label :credit_card_number, "Credit Card number(without spaces)"
     .input-group
-      = f.text_field :credit_card_number, class: "form-control", placeholder: "XXXX XXXX XXXX XXXX"
+      = f.text_field :credit_card_number, class: "form-control", placeholder: "XXXX XXXX XXXX XXXX", id: "credit_card_number"
       %span.input-group-addon
         %i.fa.fa-credit-card
   .form-group.col-md-6
     = f.label :expiration_month
-    = f.select :expiration_month, months, {}, class: "form-control"
+    = f.select :expiration_month, months, {}, class: "form-control", id: "expiration_month"
   .form-group.col-md-6
     = f.label :expiration_year
-    = f.select :expiration_year, years, {}, class: "form-control"
+    = f.select :expiration_year, years, {}, class: "form-control", id: "expiration_year"
   .form-group.col-md-10
     = f.label :card_verification_value, 'Security Code(3 on back, AmEx: 4 on front)'
-    = f.text_field :card_verification_value, class: "form-control", placeholder: "XXX"
+    = f.text_field :card_verification_value, class: "form-control", placeholder: "XXX", id: "card_verification_value"
     = f.number_field :amount, value: @total_amount_to_pay, class: "form-control", type: 'hidden'
   %ul.price-tags.pull-right
     %li.text-muted
@@ -30,5 +30,5 @@
       %a
         = number_to_currency @total_amount_to_pay
   .form-group
-    = f.submit "Charge Card", class: "btn btn-primary"
+    = f.submit "Charge Card", class: "btn btn-primary", id: "charge_card"
     = link_to "Cancel", conference_conference_registrations_path, class: "btn btn-danger"
diff --git a/spec/features/ticket_purchases_spec.rb b/spec/features/ticket_purchases_spec.rb
index fdb27a5d..efacba34 100644
--- a/spec/features/ticket_purchases_spec.rb
+++ b/spec/features/ticket_purchases_spec.rb
@@ -35,11 +35,11 @@ feature Registration do
 
         fill_in 'first_name', with: 'foo'
         fill_in 'last_name', with: 'bar'
-        fill_in 'expiration_year', Date.current.year + 2
+        fill_in 'expiration_year', with: Date.current.year + 2
         fill_in 'card_verification_value', with: '123'
         fill_in 'credit_card_number', with: '4242424242424242'
 
-        click_button 'Charge Card'
+        click_button 'charge_card'
 
         payment = Payment.where(user_id: participant, conference_id: conference.id).first
         expect(payment.amount).to eq(20)