diff --git a/test/Database.hs b/test/Database.hs
index 62d26c2c7..a3ca55a07 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -718,7 +718,7 @@ fillDb = do
     , tutorialCourse = pmo
     , tutorialType = "Tutorium"
     , tutorialCapacity = Just 30
-    , tutorialRoom = "Hilbert-Raum"
+    , tutorialRoom = Just "Hilbert-Raum"
     , tutorialTime = Occurrences
       { occurrencesScheduled = Set.singleton $ ScheduleWeekly Tuesday (TimeOfDay 08 15 00) (TimeOfDay 10 00 00)
       , occurrencesExceptions = Set.empty
@@ -737,7 +737,7 @@ fillDb = do
     , tutorialCourse = pmo
     , tutorialType = "Tutorium"
     , tutorialCapacity = Just 30
-    , tutorialRoom = "Hilbert-Raum"
+    , tutorialRoom = Just "Hilbert-Raum"
     , tutorialTime = Occurrences
       { occurrencesScheduled  = Set.singleton $ ScheduleWeekly Tuesday (TimeOfDay 10 15 00) (TimeOfDay 12 00 00)
       , occurrencesExceptions = Set.empty
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index f52c8b13c..cdd916f3b 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -63,7 +63,7 @@ instance Arbitrary Tutorial where
     <*> arbitrary
     <*> (CI.mk . pack . getPrintableString <$> arbitrary)
     <*> (fmap getPositive <$> arbitrary)
-    <*> (pack . getPrintableString <$> arbitrary)
+    <*> (assertM' (not . null) . pack . getPrintableString <$> arbitrary)
     <*> arbitrary
     <*> (fmap (CI.mk . pack . getPrintableString) <$> arbitrary)
     <*> arbitrary