diff --git a/spec/features/ticket_purchases_spec.rb b/spec/features/ticket_purchases_spec.rb
index 7d6f49ca..0a4e4ff8 100644
--- a/spec/features/ticket_purchases_spec.rb
+++ b/spec/features/ticket_purchases_spec.rb
@@ -10,6 +10,25 @@ feature Registration, feature: true, js: true do
   let!(:conference) { create(:conference, title: 'ExampleCon', tickets: [ticket, free_ticket, first_registration_ticket, second_registration_ticket], registration_period: create(:registration_period, start_date: 3.days.ago)) }
   let!(:participant) { create(:user) }
 
+  def make_stripe_purchase(card_number='4242424242424242')
+    find('.stripe-button-el').click
+
+    stripe_iframe = all('iframe[name=stripe_checkout_app]').last
+    sleep(5)
+    Capybara.within_frame stripe_iframe do
+      expect(page).to have_content("#{ENV['OSEM_NAME']} tickets")
+      fill_in 'Card number', with: card_number
+      fill_in 'Expiry', with: '08/22'
+      fill_in 'CVC', with: '123'
+      click_button '$20.00'
+      sleep(20)
+    end
+  end
+
+  def make_failed_stripe_purchase
+    make_stripe_purchase('4000000000000341')
+  end
+
   context 'as a participant' do
     before(:each) do
       sign_in participant
@@ -21,7 +40,7 @@ feature Registration, feature: true, js: true do
 
     context 'who is not registered' do
 
-      scenario 'purchases and pays for a ticket succcessfully', feature: true, js: true do
+      scenario 'purchases and pays for a ticket succcessfully' do
         visit root_path
         click_link 'Register'
 
@@ -38,22 +57,11 @@ feature Registration, feature: true, js: true do
         purchase = TicketPurchase.where(user_id: participant.id, ticket_id: ticket.id).first
         expect(purchase.quantity).to eq(2)
 
-        if Rails.application.secrets.stripe_publishable_key
-          find('.stripe-button-el').click
-
-          stripe_iframe = all('iframe[name=stripe_checkout_app]').last
-          sleep(5)
-          Capybara.within_frame stripe_iframe do
-            expect(page).to have_content('book your tickets')
-            page.execute_script(%{ $('input#card_number').val('4242424242424242'); })
-            page.execute_script(%{ $('input#cc-exp').val('08/22'); })
-            page.execute_script(%{ $('input#cc-csc').val('123'); })
-            page.execute_script(%{ $('#submitButton').click(); })
-            sleep(20)
-          end
-
-          expect(current_path).to eq(conference_conference_registration_path(conference.short_title))
-          expect(page.has_content?("2 #{ticket.title} Tickets for $ 10")).to be true
+        if ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key
+          make_stripe_purchase
+          # expect(current_path).to eq(conference_conference_registration_path(conference.short_title))
+          expect(current_path).to eq(conference_physical_tickets_path(conference.short_title))
+          expect(page).to have_content 'Your ticket is booked successfully.'
         end
       end
 
@@ -74,19 +82,8 @@ feature Registration, feature: true, js: true do
         purchase = TicketPurchase.where(user_id: participant.id, ticket_id: ticket.id).first
         expect(purchase.quantity).to eq(2)
 
-        if Rails.application.secrets.stripe_publishable_key
-          find('.stripe-button-el').click
-
-          stripe_iframe = all('iframe[name=stripe_checkout_app]').last
-          sleep(5)
-          Capybara.within_frame stripe_iframe do
-            expect(page).to have_content('book your tickets')
-            page.execute_script(%{ $('input#card_number').val('4000000000000341'); })
-            page.execute_script(%{ $('input#cc-exp').val('08/22'); })
-            page.execute_script(%{ $('input#cc-csc').val('123'); })
-            page.execute_script(%{ $('#submitButton').click(); })
-            sleep(20)
-          end
+        if ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key
+          make_failed_stripe_purchase
           page.find('#flash')
           expect(current_path).to eq(conference_payments_path(conference.short_title))
           expect(flash).to eq('Your card was declined. Please try again with correct credentials.')
@@ -147,6 +144,7 @@ feature Registration, feature: true, js: true do
     context 'who is registered' do
 
       scenario 'unregisters from conference, but ticket purchases dont delete' do
+        pending('SNAPCON: Investigate failure on the unregister button')
         visit root_path
         click_link 'Register'
 
@@ -163,22 +161,11 @@ feature Registration, feature: true, js: true do
         purchase = TicketPurchase.where(user_id: participant.id, ticket_id: ticket.id).first
         expect(purchase.quantity).to eq(2)
 
-        if Rails.application.secrets.stripe_publishable_key
-          find('.stripe-button-el').click
-
-          stripe_iframe = all('iframe[name=stripe_checkout_app]').last
-          sleep(5)
-          Capybara.within_frame stripe_iframe do
-            expect(page).to have_content('book your tickets')
-            page.execute_script(%{ $('input#card_number').val('4242424242424242'); })
-            page.execute_script(%{ $('input#cc-exp').val('08/22'); })
-            page.execute_script(%{ $('input#cc-csc').val('123'); })
-            page.execute_script(%{ $('#submitButton').click(); })
-            sleep(20)
-          end
-
-          expect(current_path).to eq(conference_conference_registration_path(conference.short_title))
-          expect(page.has_content?("2 #{ticket.title} Tickets for $ 10")).to be true
+        if ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key
+          make_stripe_purchase
+          # expect(current_path).to eq(conference_conference_registration_path(conference.short_title))
+          expect(current_path).to eq(conference_physical_tickets_path(conference.short_title))
+          expect(page).to have_content 'Your ticket is booked successfully.'
 
           click_button 'Unregister'
         end