diff --git a/app/components/forms/wizard/basic-details-step.js b/app/components/forms/wizard/basic-details-step.js
index e25ba000bdd..e8b400a52e3 100644
--- a/app/components/forms/wizard/basic-details-step.js
+++ b/app/components/forms/wizard/basic-details-step.js
@@ -11,6 +11,7 @@ import FormMixin from 'open-event-frontend/mixins/form';
 import { inject as service } from '@ember/service';
 import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
 import { protocolLessValidUrlPattern } from 'open-event-frontend/utils/validators';
+import ENV from 'open-event-frontend/config/environment';
 
 export default Component.extend(FormMixin, EventWizardMixin, {
 
@@ -366,7 +367,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
         .then(authorization => {
           this.set('data.event.stripeAuthorization', this.store.createRecord('stripe-authorization', {
             stripeAuthCode       : authorization.authorizationCode,
-            stripePublishableKey : this.settings.stripePublishableKey
+            stripePublishableKey : ENV.environment === 'development' || ENV.environment === 'test' ? this.settings.stripeTestPublishableKey : this.settings.stripePublishableKey
           }));
         })
         .catch(error => {
diff --git a/app/templates/public/index.hbs b/app/templates/public/index.hbs
index f019419dd33..d51ccb019ec 100644
--- a/app/templates/public/index.hbs
+++ b/app/templates/public/index.hbs
@@ -11,7 +11,7 @@
         <div class="ui segment">
           <h3 class="ui header">{{t 'Tickets'}}</h3>
         </div>
-        <div class="ui segment x-scrollable">
+        <div class="ui segment">
           {{public/ticket-list eventCurrency=model.event.paymentCurrency
                                ticketUrl=model.event.ticketUrl
                                data=model.tickets
diff --git a/app/torii-providers/stripe.js b/app/torii-providers/stripe.js
index 88895787372..589bbf723c4 100644
--- a/app/torii-providers/stripe.js
+++ b/app/torii-providers/stripe.js
@@ -2,11 +2,12 @@ import stripeConnect from 'torii/providers/stripe-connect';
 import { alias } from '@ember/object/computed';
 import { inject } from '@ember/service';
 import { configurable } from 'torii/configuration';
+import ENV from 'open-event-frontend/config/environment';
 
 export default stripeConnect.extend({
   settings: inject(),
 
-  clientId: alias('settings.stripeClientId'),
+  clientId: ENV.environment === 'development' || ENV.environment === 'test' ? alias('settings.stripeTestClientId') : alias('settings.stripeClientId'),
 
   redirectUri: configurable('redirectUri', function() {
     return `${window.location.origin}/torii/redirect.html`;