diff --git a/apps/memory.c b/apps/memory.c
index e7896910..81f6b8da 100644
--- a/apps/memory.c
+++ b/apps/memory.c
@@ -294,6 +294,7 @@ static void malloc(void)
 /** @brief This is a simple procedure to test memory management subsystem */
 int memory(void* arg)
 {
+	int ret;
 	tid_t id;
 
 	kprintf("======== PAGING: test started...\n");
@@ -307,8 +308,10 @@ int memory(void* arg)
 
 	kprintf("======== USER: test userspace...\n");
 	char* argv[] = {"/bin/memtest", "17", "kb", "5", NULL};
-	create_user_task(&id, argv[0], argv);
-	kprintf("   calling %s %s %s %s with id = %i:\n", argv[0], argv[1], argv[2], argv[3], id);
+	ret = create_user_task(&id, argv[0], argv);
+	test(!ret, "calling %s %s %s %s with id = %i:\n", argv[0], argv[1], argv[2], argv[3], id);
+	wait(&ret);
+	test(!ret, "userspace task returned with code = %d", ret);
 
 	kprintf("======== All tests finished successfull...\n");