diff --git a/src/tests/base/test_locking.py b/src/tests/base/test_locking.py
new file mode 100644
index 0000000000..8b262ec3e9
--- /dev/null
+++ b/src/tests/base/test_locking.py
@@ -0,0 +1,48 @@
+import time
+from django.utils.timezone import now
+from pretix.base.models import Event, Organizer, EventLock
+from pretix.base.services import locking
+import pytest
+
+
+@pytest.fixture
+def event():
+    o = Organizer.objects.create(name='Dummy', slug='dummy')
+    event = Event.objects.create(
+        organizer=o, name='Dummy', slug='dummy',
+        date_from=now()
+    )
+    return event
+
+
+@pytest.mark.django_db
+def test_locking_exclusive(event):
+    with event.lock():
+        with pytest.raises(EventLock.LockTimeoutException):
+            ev = Event.objects.current.get(identity=event.identity)
+            with ev.lock():
+                pass
+
+
+@pytest.mark.django_db
+def test_locking_different_events(event):
+    other = Event.objects.create(
+        organizer=event.organizer, name='Dummy', slug='dummy2',
+        date_from=now()
+    )
+    with event.lock():
+        with other.lock():
+            pass
+
+
+@pytest.mark.django_db
+def test_lock_timeout_steal(event):
+    locking.LOCK_TIMEOUT = 5
+    locking.lock_event(event)
+    with pytest.raises(EventLock.LockTimeoutException):
+        ev = Event.objects.current.get(identity=event.identity)
+        locking.lock_event(ev)
+    time.sleep(6)
+    locking.lock_event(ev)
+    with pytest.raises(EventLock.LockReleaseException):
+        locking.release_event(event)