diff --git a/repos/os/src/test/signal/main.cc b/repos/os/src/test/signal/main.cc
index 5b11fcc338..260c5c4d7e 100644
--- a/repos/os/src/test/signal/main.cc
+++ b/repos/os/src/test/signal/main.cc
@@ -529,6 +529,9 @@ static void check_context_management()
 
 	printf("destroy sender\n");
 	destroy(env()->heap(), sender);
+
+	destroy(env()->heap(), context);
+	destroy(env()->heap(), rec);
 }
 
 
@@ -596,6 +599,7 @@ static void synchronized_context_destruction_test()
 	}
 
 	signal_context_destroyer.join();
+	signal_context_destroyed = false;
 }