diff --git a/test/xorriso.c b/test/xorriso.c
index a5d700ac..d5ef69ba 100644
--- a/test/xorriso.c
+++ b/test/xorriso.c
@@ -6377,6 +6377,9 @@ int Xorriso_main(int argc, char **argv)
  }
 end_sucessfully:;
  Xorriso_process_msg_queues(xorriso, 0);
+ if(xorriso->volset_change_pending)
+   Xorriso_option_end(xorriso, 0);
+ Xorriso_process_msg_queues(xorriso, 0);
  Xorriso_destroy(&xorriso,0);
  exit(0);
 }
diff --git a/test/xorriso_timestamp.h b/test/xorriso_timestamp.h
index 5aba9b6a..29ce0525 100644
--- a/test/xorriso_timestamp.h
+++ b/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2007.11.11.112321"
+#define Xorriso_timestamP "2007.11.11.154453"