diff --git a/src/pretix/base/i18n.py b/src/pretix/base/i18n.py
index ece74f4994..f5c56ce23e 100644
--- a/src/pretix/base/i18n.py
+++ b/src/pretix/base/i18n.py
@@ -40,7 +40,7 @@ class LazyI18nString:
             elif settings.LANGUAGE_CODE in self.data and self.data[settings.LANGUAGE_CODE]:
                 return self.data[settings.LANGUAGE_CODE]
             elif len(self.data):
-                return self.data.items()[0][1]
+                return list(self.data.items())[0][1]
             else:
                 return ""
         else:
diff --git a/src/tests/base/test_i18n.py b/src/tests/base/test_i18n.py
new file mode 100644
index 0000000000..dc2f3ec8f5
--- /dev/null
+++ b/src/tests/base/test_i18n.py
@@ -0,0 +1,96 @@
+import random
+
+from django.test import TestCase
+from django.core.cache import cache as django_cache
+from django.utils import translation
+from django.utils.timezone import now
+from pretix.base.i18n import LazyI18nString
+
+from pretix.base.models import Event, Organizer, ItemCategory
+
+
+class I18nStringTest(TestCase):
+    """
+    This test case tests the LazyI18nString class
+    """
+
+    def test_explicit_translation(self):
+        data = {
+            'de': 'Hallo',
+            'en': 'Hello'
+        }
+        s = LazyI18nString(data)
+        translation.activate('en')
+        self.assertEqual(str(s), 'Hello')
+        translation.activate('de')
+        self.assertEqual(str(s), 'Hallo')
+
+    def test_missing_default_translation(self):
+        data = {
+            'de': 'Hallo',
+        }
+        s = LazyI18nString(data)
+        translation.activate('en')
+        self.assertEqual(str(s), 'Hallo')
+        translation.activate('de')
+        self.assertEqual(str(s), 'Hallo')
+
+    def test_missing_translation(self):
+        data = {
+            'en': 'Hello',
+        }
+        s = LazyI18nString(data)
+        translation.activate('en')
+        self.assertEqual(str(s), 'Hello')
+        translation.activate('de')
+        self.assertEqual(str(s), 'Hello')
+
+    def test_legacy_string(self):
+        s = LazyI18nString("Hello")
+        translation.activate('en')
+        self.assertEqual(str(s), 'Hello')
+        translation.activate('de')
+        self.assertEqual(str(s), 'Hello')
+
+    def test_none(self):
+        s = LazyI18nString(None)
+        self.assertEqual(str(s), "")
+        s = LazyI18nString("")
+        self.assertEqual(str(s), "")
+
+
+class I18nFieldTest(TestCase):
+    """
+    This test case tests the I18n*Field classes
+    """
+    @classmethod
+    def setUpTestData(cls):
+        o = Organizer.objects.create(name='Dummy', slug='dummy')
+        cls.event = Event.objects.create(
+            organizer=o, name='Dummy', slug='dummy',
+            date_from=now(),
+        )
+
+    def test_save_load_cycle_plain_string(self):
+        obj = ItemCategory.objects.create(event=self.event, name="Hello")
+        obj = ItemCategory.objects.get(id=obj.id)
+        self.assertIsInstance(obj.name, LazyI18nString)
+        translation.activate('en')
+        self.assertEqual(str(obj.name), "Hello")
+        translation.activate('de')
+        self.assertEqual(str(obj.name), "Hello")
+
+    def test_save_load_cycle_i18n_string(self):
+        obj = ItemCategory.objects.create(event=self.event,
+                                          name=LazyI18nString(
+                                              {
+                                                  'de': 'Hallo',
+                                                  'en': 'Hello'
+                                              }
+                                          ))
+        obj = ItemCategory.objects.get(id=obj.id)
+        self.assertIsInstance(obj.name, LazyI18nString)
+        translation.activate('en')
+        self.assertEqual(str(obj.name), "Hello")
+        translation.activate('de')
+        self.assertEqual(str(obj.name), "Hallo")