diff --git a/tests/fs_report.nix b/tests/fs_report.nix
index de32281..d3ccc8d 100644
--- a/tests/fs_report.nix
+++ b/tests/fs_report.nix
@@ -8,11 +8,11 @@ testEnv.mkTest {
   testConfig = ./fs_report.xml;
 
   bootModules = {
-    fs_report = "${depot.fs_report}/bin/fs_report";
-    fs_rom = "${depot.fs_rom}/bin/fs_rom";
-    ram_fs = "${depot.ram_fs}/bin/ram_fs";
-    test-fs_report = "${depot.test-fs_report}/bin/test-fs_report";
-    "vfs.lib.so" = "${depot.vfs}/lib/vfs.lib.so";
+    fs_report = "${genode.os}/bin/fs_report";
+    fs_rom = "${genode.os}/bin/fs_rom";
+    ram_fs = "${genode.os}/bin/ram_fs";
+    test-fs_report = "${genode.os}/bin/test-fs_report";
+    "vfs.lib.so" = "${genode.os}/lib/vfs.lib.so";
   };
 
   testScript = ''
diff --git a/tests/libc.nix b/tests/libc.nix
index 14203f0..2a3afb3 100644
--- a/tests/libc.nix
+++ b/tests/libc.nix
@@ -12,7 +12,7 @@ testEnv.mkTest rec {
     "libm.lib.so" = "${depot.libc}/lib/libm.lib.so";
     "posix.lib.so" = "${depot.posix}/lib/posix.lib.so";
     "test-libc" = "${depot.test-libc}/bin/test-libc";
-    "vfs.lib.so" = "${depot.vfs}/lib/vfs.lib.so";
+    "vfs.lib.so" = "${genode.os}/lib/vfs.lib.so";
   };
 
   qemuMem = 384;
diff --git a/tests/log.nix b/tests/log.nix
index db5528a..486b2f6 100644
--- a/tests/log.nix
+++ b/tests/log.nix
@@ -7,7 +7,7 @@ testEnv.mkTest rec {
 
   testConfig = testEnv.lib.renderDhallInit ./log.dhall "{=}";
 
-  bootModules.test-log = "${depot.test-log}/bin/test-log";
+  bootModules.test-log = "${genode.base}/bin/test-log";
 
   testScript = "run_genode_until {Test done.} 10";
 }
diff --git a/tests/signal.nix b/tests/signal.nix
index a01c1ac..5c99b57 100644
--- a/tests/signal.nix
+++ b/tests/signal.nix
@@ -7,7 +7,7 @@ testEnv.mkTest rec {
 
   testConfig = testEnv.lib.renderDhallInit ./signal.dhall "{=}";
 
-  bootModules.test-signal = "${depot.test-signal}/bin/test-signal";
+  bootModules.test-signal = "${genode.os}/bin/test-signal";
 
   testScript = "run_genode_until {--- Signalling test finished ---} 120";
 }
diff --git a/upstream/default.nix b/upstream/default.nix
index 20a15f8..0abbe23 100644
--- a/upstream/default.nix
+++ b/upstream/default.nix
@@ -40,8 +40,8 @@ let
 
       src = fetchgit {
         url = "https://git.sr.ht/~ehmry/genode";
-        rev = "ac3bbbde85a0e0e457ea40562263d7900179e6bb";
-        sha256 = "1ss3yaw6ixwrqavjy78z3i3jp93d4wzqfpmn82sajnwl1i93l8g0";
+        rev = "dc0084cd5bebfdba74323bbe8f0a9dd1e8b7c524";
+        sha256 = "12qwv6xq51dr5lps60c0r9dmxgk2agd8jgh0prafjk0wxq3xs95p";
         fetchSubmodules = false;
       };