diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py
index 25edf86f1b..95f303dc81 100644
--- a/src/pretix/base/payment.py
+++ b/src/pretix/base/payment.py
@@ -43,7 +43,6 @@ from zoneinfo import ZoneInfo
 
 from django import forms
 from django.conf import settings
-from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.db import transaction
 from django.dispatch import receiver
@@ -93,15 +92,73 @@ class PaymentProviderForm(Form):
         cleaned_data = super().clean()
         for k, v in self.fields.items():
             val = cleaned_data.get(k)
-            if v._required and not val:
+            if hasattr(v, '_required') and v._required and not val:
                 self.add_error(k, _('This field is required.'))
         return cleaned_data
 
 
+class GiftCardPaymentForm(PaymentProviderForm):
+    def __init__(self, *args, **kwargs):
+        self.event = kwargs.pop('event')
+        self.testmode = kwargs.pop('testmode')
+        self.positions = kwargs.pop('positions')
+        self.used_cards = kwargs.pop('used_cards')
+        super().__init__(*args, **kwargs)
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if "code" not in cleaned_data:
+            return cleaned_data
+
+        code = cleaned_data["code"].strip()
+        msg = ""
+        for p in self.positions:
+            if p.item.issue_giftcard:
+                msg = _("You cannot pay with gift cards when buying a gift card.")
+                self.add_error('code', msg)
+                return cleaned_data
+        try:
+            event = self.event
+            gc = event.organizer.accepted_gift_cards.get(
+                secret=code
+            )
+            if gc.currency != event.currency:
+                msg = _("This gift card does not support this currency.")
+            elif gc.testmode and not self.testmode:
+                msg = _("This gift card can only be used in test mode.")
+            elif not gc.testmode and self.testmode:
+                msg = _("Only test gift cards can be used in test mode.")
+            elif gc.expires and gc.expires < time_machine_now():
+                msg = _("This gift card is no longer valid.")
+            elif gc.value <= Decimal("0.00"):
+                msg = _("All credit on this gift card has been used.")
+
+            if msg:
+                self.add_error('code', msg)
+                return cleaned_data
+
+            if gc.pk in self.used_cards:
+                self.add_error('code', _("This gift card is already used for your payment."))
+                return cleaned_data
+        except GiftCard.DoesNotExist:
+            if event.vouchers.filter(code__iexact=code).exists():
+                msg = _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
+                        "the product selection.")
+                self.add_error('code', msg)
+            else:
+                msg = _("This gift card is not known.")
+                self.add_error('code', msg)
+        except GiftCard.MultipleObjectsReturned:
+            msg = _("This gift card can not be redeemed since its code is not unique. Please contact the organizer of this event.")
+            self.add_error('code', msg)
+        return cleaned_data
+
+
 class BasePaymentProvider:
     """
     This is the base class for all payment providers.
     """
+    payment_form_template_name = 'pretixpresale/event/checkout_payment_form_default.html'
 
     def __init__(self, event: Event):
         self.event = event
@@ -694,7 +751,7 @@ class BasePaymentProvider:
         :param order: Only set when this is a change to a new payment method for an existing order.
         """
         form = self.payment_form(request)
-        template = get_template('pretixpresale/event/checkout_payment_form_default.html')
+        template = get_template(self.payment_form_template_name)
         ctx = {'request': request, 'form': form}
         return template.render(ctx)
 
@@ -1318,6 +1375,49 @@ class GiftCardPayment(BasePaymentProvider):
     multi_use_supported = True
     execute_payment_needs_user = False
     verbose_name = _("Gift card")
+    payment_form_class = GiftCardPaymentForm
+    payment_form_template_name = 'pretixcontrol/giftcards/checkout.html'
+
+    def payment_form(self, request: HttpRequest) -> Form:
+        # Unfortunately, in payment_form we do not know if we're in checkout
+        # or in an existing order. But we need to do the validation logic in the
+        # form to get the error messages in the right places for accessbility :-(
+        if 'checkout' in request.resolver_match.url_name:
+            cs = cart_session(request)
+            used_cards = [
+                p.get('info_data', {}).get('gift_card')
+                for p in cs.get('payments', [])
+                if p.get('info_data', {}).get('gift_card')
+            ]
+            positions = get_cart(request)
+            testmode = self.event.testmode
+        else:
+            used_cards = []
+            order = self.event.orders.get(code=request.resolver_match.kwargs["order"])
+            positions = order.positions.all()
+            testmode = order.testmode
+
+        form = self.payment_form_class(
+            event=self.event,
+            used_cards=used_cards,
+            positions=positions,
+            testmode=testmode,
+            data=(request.POST if request.method == 'POST' and request.POST.get("payment") == self.identifier else None),
+            prefix='payment_%s' % self.identifier,
+            initial={
+                k.replace('payment_%s_' % self.identifier, ''): v
+                for k, v in request.session.items()
+                if k.startswith('payment_%s_' % self.identifier)
+            }
+        )
+        form.fields = self.payment_form_fields
+
+        for k, v in form.fields.items():
+            v._required = v.required
+            v.required = False
+            v.widget.is_required = False
+
+        return form
 
     @property
     def public_name(self) -> str:
@@ -1350,6 +1450,19 @@ class GiftCardPayment(BasePaymentProvider):
         f.move_to_end("_enabled", last=False)
         return f
 
+    @property
+    def payment_form_fields(self):
+        fields = [
+            (
+                "code",
+                forms.CharField(
+                    label=_("Gift card code"),
+                    required=True,
+                ),
+            ),
+        ]
+        return OrderedDict(fields)
+
     @property
     def test_mode_message(self) -> str:
         return _("In test mode, only test cards will work.")
@@ -1360,11 +1473,6 @@ class GiftCardPayment(BasePaymentProvider):
     def order_change_allowed(self, order: Order) -> bool:
         return super().order_change_allowed(order) and self.event.organizer.has_gift_cards
 
-    def payment_form_render(self, request: HttpRequest, total: Decimal) -> str:
-        return get_template('pretixcontrol/giftcards/checkout.html').render({
-            'request': request,
-        })
-
     def checkout_confirm_render(self, request, order=None, info_data=None) -> str:
         return get_template('pretixcontrol/giftcards/checkout_confirm.html').render({
             'info_data': info_data,
@@ -1432,21 +1540,6 @@ class GiftCardPayment(BasePaymentProvider):
     def _add_giftcard_to_cart(self, cs, gc):
         from pretix.base.services.cart import add_payment_to_cart_session
 
-        if gc.currency != self.event.currency:
-            raise ValidationError(_("This gift card does not support this currency."))
-        if gc.testmode and not self.event.testmode:
-            raise ValidationError(_("This gift card can only be used in test mode."))
-        if not gc.testmode and self.event.testmode:
-            raise ValidationError(_("Only test gift cards can be used in test mode."))
-        if gc.expires and gc.expires < time_machine_now():
-            raise ValidationError(_("This gift card is no longer valid."))
-        if gc.value <= Decimal("0.00"):
-            raise ValidationError(_("All credit on this gift card has been used."))
-
-        for p in cs.get('payments', []):
-            if p['provider'] == self.identifier and p['info_data']['gift_card'] == gc.pk:
-                raise ValidationError(_("This gift card is already used for your payment."))
-
         add_payment_to_cart_session(
             cs,
             self,
@@ -1458,77 +1551,32 @@ class GiftCardPayment(BasePaymentProvider):
         )
 
     def checkout_prepare(self, request: HttpRequest, cart: Dict[str, Any]) -> Union[bool, str, None]:
-        for p in get_cart(request):
-            if p.item.issue_giftcard:
-                messages.error(request, _("You cannot pay with gift cards when buying a gift card."))
-                return
+        form = self.payment_form(request)
+        if not form.is_valid():
+            return False
 
-        if not request.POST.get("giftcard"):
-            messages.error(request, _("Please enter the code of your gift card."))
-            return
-
-        try:
-            gc = self.event.organizer.accepted_gift_cards.get(
-                secret=request.POST.get("giftcard").strip()
-            )
-            cs = cart_session(request)
-            try:
-                self._add_giftcard_to_cart(cs, gc)
-                return True
-            except ValidationError as e:
-                messages.error(request, str(e.message))
-                return
-        except GiftCard.DoesNotExist:
-            if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard")).exists():
-                messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
-                                            "the product selection."))
-            else:
-                messages.error(request, _("This gift card is not known."))
-        except GiftCard.MultipleObjectsReturned:
-            messages.error(request, _("This gift card can not be redeemed since its code is not unique. Please contact the organizer of this event."))
+        gc = self.event.organizer.accepted_gift_cards.get(
+            secret=form.cleaned_data["code"]
+        )
+        cs = cart_session(request)
+        self._add_giftcard_to_cart(cs, gc)
+        return True
 
     def payment_prepare(self, request: HttpRequest, payment: OrderPayment) -> Union[bool, str, None]:
-        for p in payment.order.positions.all():
-            if p.item.issue_giftcard:
-                messages.error(request, _("You cannot pay with gift cards when buying a gift card."))
-                return
-
-        try:
-            gc = self.event.organizer.accepted_gift_cards.get(
-                secret=request.POST.get("giftcard").strip()
-            )
-            if gc.currency != self.event.currency:
-                messages.error(request, _("This gift card does not support this currency."))
-                return
-            if gc.testmode and not payment.order.testmode:
-                messages.error(request, _("This gift card can only be used in test mode."))
-                return
-            if not gc.testmode and payment.order.testmode:
-                messages.error(request, _("Only test gift cards can be used in test mode."))
-                return
-            if gc.expires and gc.expires < time_machine_now():
-                messages.error(request, _("This gift card is no longer valid."))
-                return
-            if gc.value <= Decimal("0.00"):
-                messages.error(request, _("All credit on this gift card has been used."))
-                return
-            payment.info_data = {
-                'gift_card': gc.pk,
-                'gift_card_secret': gc.secret,
-                'retry': True
-            }
-            payment.amount = min(payment.amount, gc.value)
-            payment.save()
-
-            return True
-        except GiftCard.DoesNotExist:
-            if self.event.vouchers.filter(code__iexact=request.POST.get("giftcard").strip()).exists():
-                messages.warning(request, _("You entered a voucher instead of a gift card. Vouchers can only be entered on the first page of the shop below "
-                                            "the product selection."))
-            else:
-                messages.error(request, _("This gift card is not known."))
-        except GiftCard.MultipleObjectsReturned:
-            messages.error(request, _("This gift card can not be redeemed since its code is not unique. Please contact the organizer of this event."))
+        form = self.payment_form(request)
+        if not form.is_valid():
+            return False
+        gc = self.event.organizer.accepted_gift_cards.get(
+            secret=form.cleaned_data["code"]
+        )
+        payment.info_data = {
+            'gift_card': gc.pk,
+            'gift_card_secret': gc.secret,
+            'retry': True
+        }
+        payment.amount = min(payment.amount, gc.value)
+        payment.save()
+        return True
 
     def execute_payment(self, request: HttpRequest, payment: OrderPayment, is_early_special_case=False) -> str:
         for p in payment.order.positions.all():
diff --git a/src/pretix/control/templates/pretixcontrol/giftcards/checkout.html b/src/pretix/control/templates/pretixcontrol/giftcards/checkout.html
index e4e0a90d2f..ca579a36b4 100644
--- a/src/pretix/control/templates/pretixcontrol/giftcards/checkout.html
+++ b/src/pretix/control/templates/pretixcontrol/giftcards/checkout.html
@@ -1,5 +1,7 @@
 {% load i18n %}
+{% load bootstrap3 %}
 {% load rich_text %}
 
 {{ request.event.settings.payment_giftcard_public_description|rich_text }}
-<input name="giftcard" class="form-control" placeholder="{% trans "Gift card code" %}">
+
+{% bootstrap_form form layout='checkout' %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
index 84d23059f3..e658d5a4a1 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
@@ -16,16 +16,17 @@
                 {% for p in current_payments %}
                     <div class="list-group-item">
                         <div class="row">
-                            <div class="col-xs-9">
-                                {{ p.provider_name }}
+                            <div class="col-md-7 col-sm-6 col-xs-8">
+                                <strong id="payment-label-{{ forloop.counter }}">{{ p.provider_name }}</strong>
                             </div>
-                            <div class="col-xs-2 text-right">
+                            <div class="col-md-2 col-sm-2 col-xs-4 text-right">
                                 {{ p.payment_amount|money:request.event.currency }}
                             </div>
-                            <div class="col-xs-1 text-right">
-                                <button name="remove_payment" value="{{ p.id }}" title="{% trans "Remove payment" %}"
-                                    class="btn btn-link btn-xs">
-                                    <span class="fa fa-trash text-danger"></span>
+                            <div class="col-md-3 col-sm-4 col-xs-12 text-right">
+                                <button name="remove_payment" value="{{ p.id }}" aria-describedby="payment-label-{{ forloop.counter }}"
+                                    class="btn btn-danger">
+                                    <span class="fa fa-trash"></span>
+                                    {% trans "Remove payment" %}
                                 </button>
                             </div>
                         </div>
@@ -34,11 +35,11 @@
                 {% if remaining %}
                     <div class="list-group-item">
                         <div class="row">
-                            <div class="col-xs-9">
+                            <div class="col-md-7 col-sm-6 col-xs-8">
                                 <strong>{% trans "Remaining balance" %}</strong><br>
                                 <span class="text-muted">{% trans "Please select a payment method below." %}</span>
                             </div>
-                            <div class="col-xs-2 text-right">
+                            <div class="col-md-2 col-sm-2 col-xs-4 text-right">
                                 <strong>
                                     {{ remaining|money:request.event.currency }}
                                 </strong>
diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py
index cb2533c8c7..362dfef5d2 100644
--- a/src/pretix/presale/views/cart.py
+++ b/src/pretix/presale/views/cart.py
@@ -70,7 +70,7 @@ from pretix.helpers.http import redirect_to_url
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.views import (
     CartMixin, EventViewMixin, allow_cors_if_namespaced,
-    allow_frame_if_namespaced, iframe_entry_view_wrapper,
+    allow_frame_if_namespaced, get_cart, iframe_entry_view_wrapper,
 )
 from pretix.presale.views.event import (
     get_grouped_items, item_group_by_category,
@@ -441,7 +441,7 @@ class CartApplyVoucher(EventViewMixin, CartActionMixin, AsyncAction, View):
         return _('We applied the voucher to as many products in your cart as we could.')
 
     def post(self, request, *args, **kwargs):
-        from pretix.base.payment import GiftCardPayment
+        from pretix.base.payment import GiftCardPayment, GiftCardPaymentForm
 
         if 'voucher' in request.POST:
             code = request.POST.get('voucher').strip()
@@ -454,6 +454,22 @@ class CartApplyVoucher(EventViewMixin, CartActionMixin, AsyncAction, View):
                         raise ValidationError(error_messages['voucher_invalid'])
                     else:
                         cs = cart_session(request)
+                        used_cards = [
+                            p.get('info_data', {}).get('gift_card')
+                            for p in cs.get('payments', [])
+                            if p.get('info_data', {}).get('gift_card')
+                        ]
+                        form = GiftCardPaymentForm(
+                            event=request.event,
+                            used_cards=used_cards,
+                            positions=get_cart(request),
+                            testmode=request.event.testmode,
+                            data={'code': code},
+                        )
+                        form.fields = gcp.payment_form_fields
+                        if not form.is_valid():
+                            # raise first validation-error in form
+                            raise next(iter(form.errors.as_data().values()))[0]
                         gcp._add_giftcard_to_cart(cs, gc)
                         messages.success(
                             request,
@@ -694,7 +710,7 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
         return context
 
     def dispatch(self, request, *args, **kwargs):
-        from pretix.base.payment import GiftCardPayment
+        from pretix.base.payment import GiftCardPayment, GiftCardPaymentForm
 
         err = None
         v = request.GET.get('voucher')
@@ -719,12 +735,28 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
                     err = error_messages['voucher_redeemed_cart'] % self.request.event.settings.reservation_time
             except Voucher.DoesNotExist:
                 try:
-                    gc = self.request.event.organizer.accepted_gift_cards.get(secret=v.strip())
-                    gcp = GiftCardPayment(self.request.event)
-                    if not gcp.is_enabled or not gcp.is_allowed(self.request, Decimal("1.00")):
+                    gc = request.event.organizer.accepted_gift_cards.get(secret=v)
+                    gcp = GiftCardPayment(request.event)
+                    if not gcp.is_enabled or not gcp.is_allowed(request, Decimal("1.00")):
                         err = error_messages['voucher_invalid']
                     else:
                         cs = cart_session(request)
+                        used_cards = [
+                            p.get('info_data', {}).get('gift_card')
+                            for p in cs.get('payments', [])
+                            if p.get('info_data', {}).get('gift_card')
+                        ]
+                        form = GiftCardPaymentForm(
+                            event=request.event,
+                            used_cards=used_cards,
+                            positions=get_cart(request),
+                            testmode=request.event.testmode,
+                            data={'code': v},
+                        )
+                        form.fields = gcp.payment_form_fields
+                        if not form.is_valid():
+                            # raise first validation-error in form
+                            raise next(iter(form.errors.as_data().values()))[0]
                         gcp._add_giftcard_to_cart(cs, gc)
                         messages.success(
                             request,
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index e373e14d9e..3d0f441f6f 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -683,6 +683,8 @@ class OrderPayChangeMethod(EventViewMixin, OrderDetailMixin, TemplateView):
         ctx['show_fees'] = any(p['fee_diff'] for p in self.provider_forms)
         if len(self.provider_forms) == 1:
             ctx['selected'] = self.provider_forms[0]['provider'].identifier
+        elif "payment" in self.request.POST:
+            ctx['selected'] = self.request.POST.get("payment")
         return ctx
 
     def get_confirm_url(self, payment):
diff --git a/src/tests/presale/test_checkout.py b/src/tests/presale/test_checkout.py
index f7ff6069ec..1522f53aa4 100644
--- a/src/tests/presale/test_checkout.py
+++ b/src/tests/presale/test_checkout.py
@@ -1591,7 +1591,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
         self.assertEqual(len(doc.select('input[name="payment"]')), 3)
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         self.assertRedirects(response, '/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
@@ -1636,7 +1636,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
         self.assertEqual(len(doc.select('input[name="payment"]')), 3)
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         self.assertRedirects(response, '/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
@@ -1646,7 +1646,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
 
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc2.secret
+            'payment_giftcard-code': gc2.secret
         }, follow=True)
         self.assertRedirects(response, '/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
@@ -1677,7 +1677,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
         self.assertEqual(len(doc.select('input[name="payment"]')), 3)
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         self.assertRedirects(response, '/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
@@ -1706,7 +1706,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
         self.assertEqual(len(doc.select('input[name="payment"]')), 3)
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         self.assertRedirects(response, '/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
@@ -1748,7 +1748,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'This gift card is no longer valid.' in response.content.decode()
 
@@ -1763,7 +1763,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'This gift card does not support this currency.' in response.content.decode()
 
@@ -1780,7 +1780,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'This gift card is not known.' in response.content.decode()
 
@@ -1798,7 +1798,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         self.assertRedirects(response, '/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
@@ -1828,7 +1828,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'This gift card is not known.' in response.content.decode()
 
@@ -1845,7 +1845,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'Only test gift cards can be used in test mode.' in response.content.decode()
 
@@ -1860,7 +1860,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'This gift card can only be used in test mode.' in response.content.decode()
 
@@ -1874,7 +1874,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'All credit on this gift card has been used.' in response.content.decode()
 
@@ -1889,11 +1889,11 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'This gift card is already used for your payment.' in response.content.decode()
 
@@ -1910,7 +1910,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
             )
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         assert 'You cannot pay with gift cards when buying a gift card.' in response.content.decode()
 
@@ -1964,7 +1964,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
 
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         self.assertRedirects(response, '/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
@@ -2006,7 +2006,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TimemachineTestMixin, TestCase):
 
         response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), {
             'payment': 'giftcard',
-            'giftcard': gc.secret
+            'payment_giftcard-code': gc.secret
         }, follow=True)
         self.assertRedirects(response, '/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug),
                              target_status_code=200)
diff --git a/src/tests/presale/test_orders.py b/src/tests/presale/test_orders.py
index 3f9f926e3c..5af1203ff9 100644
--- a/src/tests/presale/test_orders.py
+++ b/src/tests/presale/test_orders.py
@@ -673,7 +673,7 @@ class OrdersTest(BaseOrdersTest):
         assert "gift card" in response.content.decode()
         response = self.client.post(
             '/%s/%s/order/%s/%s/cancel/do' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
-                'giftcard': 'false'
+                'payment_giftcard-code': 'false'
             }, follow=True)
         self.assertRedirects(response,
                              '/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
@@ -1421,7 +1421,7 @@ class OrdersTest(BaseOrdersTest):
             '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
             {
                 'payment': 'giftcard',
-                'giftcard': gc.secret
+                'payment_giftcard-code': gc.secret
             }
         )
         with scopes_disabled():
@@ -1458,7 +1458,7 @@ class OrdersTest(BaseOrdersTest):
             '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
             {
                 'payment': 'giftcard',
-                'giftcard': gc.secret
+                'payment_giftcard-code': gc.secret
             }
         )
         assert "You cannot pay with gift cards when buying a gift card." in response.content.decode()
@@ -1471,7 +1471,7 @@ class OrdersTest(BaseOrdersTest):
             '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
             {
                 'payment': 'giftcard',
-                'giftcard': gc.secret
+                'payment_giftcard-code': gc.secret
             }
         )
         assert "This gift card does not support this currency." in response.content.decode()
@@ -1486,7 +1486,7 @@ class OrdersTest(BaseOrdersTest):
             '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
             {
                 'payment': 'giftcard',
-                'giftcard': gc.secret
+                'payment_giftcard-code': gc.secret
             }
         )
         assert "Only test gift cards can be used in test mode." in response.content.decode()
@@ -1499,7 +1499,7 @@ class OrdersTest(BaseOrdersTest):
             '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
             {
                 'payment': 'giftcard',
-                'giftcard': gc.secret
+                'payment_giftcard-code': gc.secret
             }
         )
         assert "This gift card can only be used in test mode." in response.content.decode()
@@ -1511,7 +1511,7 @@ class OrdersTest(BaseOrdersTest):
             '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
             {
                 'payment': 'giftcard',
-                'giftcard': gc.secret
+                'payment_giftcard-code': gc.secret
             }
         )
         assert "All credit on this gift card has been used." in response.content.decode()
@@ -1526,7 +1526,7 @@ class OrdersTest(BaseOrdersTest):
             '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
             {
                 'payment': 'giftcard',
-                'giftcard': gc.secret
+                'payment_giftcard-code': gc.secret
             }
         )
         assert "This gift card is not known." in response.content.decode()
@@ -1548,7 +1548,7 @@ class OrdersTest(BaseOrdersTest):
             '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
             {
                 'payment': 'giftcard',
-                'giftcard': gc.secret
+                'payment_giftcard-code': gc.secret
             }
         )
         with scopes_disabled():