diff --git a/critbit b/critbit
index b38f6f8ac..61989d933 160000
--- a/critbit
+++ b/critbit
@@ -1 +1 @@
-Subproject commit b38f6f8acdc2ce5b0613a4bb2ff8082051a25ac3
+Subproject commit 61989d93368022602a2a7ac4218c83f254701f0f
diff --git a/s/travis-build b/s/travis-build
index f27fa2050..b34b90d02 100755
--- a/s/travis-build
+++ b/s/travis-build
@@ -13,6 +13,6 @@ cd build && cmake .. \
  -DCMAKE_BUILD_TYPE=Debug .. && \
 make && cd .. && inifile &&
 build/eressea/test_eressea &&
-build/eressea/eressea -v0 scripts/run-tests-basic.lua
+build/eressea/eressea -v0 scripts/run-tests.lua
 build/eressea/eressea -v0 scripts/run-tests-e2.lua
 build/eressea/eressea -v0 scripts/run-tests-e3.lua
diff --git a/storage b/storage
index 48768e4be..bcc2874cf 160000
--- a/storage
+++ b/storage
@@ -1 +1 @@
-Subproject commit 48768e4bef7ff28365487e047d3b910127c716d0
+Subproject commit bcc2874cf289a1d0fc9cc79ff3ed271403b2e24c