diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index b430c8e158..43896548fe 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -6,7 +6,7 @@ from django.http import Http404
 from django.shortcuts import redirect
 from django.utils.functional import cached_property
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _, gettext
+from django.utils.translation import gettext, ugettext_lazy as _
 from django.views.generic import TemplateView, View
 
 from pretix.base.models import (
@@ -14,7 +14,7 @@ from pretix.base.models import (
 )
 from pretix.base.models.orders import InvoiceAddress
 from pretix.base.services.invoices import invoice_pdf
-from pretix.base.services.orders import cancel_order, OrderError
+from pretix.base.services.orders import OrderError, cancel_order
 from pretix.base.services.tickets import generate
 from pretix.base.signals import (
     register_payment_providers, register_ticket_outputs,
diff --git a/src/tests/presale/test_orders.py b/src/tests/presale/test_orders.py
index 52d74bb054..469b673f3e 100644
--- a/src/tests/presale/test_orders.py
+++ b/src/tests/presale/test_orders.py
@@ -241,7 +241,7 @@ class OrdersTest(TestCase):
         )
         assert response.status_code == 200
         response = self.client.post(
-            '/%s/%s/order/%s/%s/cancel' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
+            '/%s/%s/order/%s/%s/cancel/do' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
             }, follow=True)
         self.assertRedirects(response,
                              '/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,