diff --git a/server/test1_latency.c b/server/test1_latency.c
index 3dc0149..fb7d2f9 100644
--- a/server/test1_latency.c
+++ b/server/test1_latency.c
@@ -65,12 +65,24 @@ int main(int argc, char *argv[]) {
   long bytecount = -1;
   size_t message_size = 0;
   long last_report_bytecount = 0;
+  char idchar = '1';
+  char *qclass = "queue";
 
   if (argc < 2) {
-    fprintf(stderr, "Usage: test1 <serverhostname>\n");
+    fprintf(stderr, "Usage: test1 <serverhostname> [<idchar> [<qclass>]]\n");
     exit(1);
   }
 
+  if (argc > 2) {
+    idchar = argv[2][0];
+  }
+  printf("Idchar: '%c'\n", idchar);
+
+  if (argc > 3) {
+    qclass = argv[3];
+  }
+  printf("Qclass: %s\n", qclass);
+
   {
     struct hostent *h = gethostbyname(argv[1]);
     if (h == NULL) {
@@ -91,7 +103,8 @@ int main(int argc, char *argv[]) {
 
   f = fdopen(fd, "a+");
 
-  fprintf(f, "(9:subscribe5:test10:0:5:test15:login)(4:post7:factory(6:create5:queue(2:q1)5:test11:k)0:)(4:post2:q1(9:subscribe0:5:test18:consumer5:test11:k)0:)\n");
+  fprintf(f, "(9:subscribe5:test%c0:0:5:test%c5:login)(4:post7:factory(6:create%d:%s(2:q1)5:test%c1:k)0:)(4:post2:q1(9:subscribe0:5:test%c8:consumer5:test%c1:k)0:)\n",
+	  idchar, idchar, (int) strlen(qclass), qclass, idchar, idchar, idchar);
   fflush(f);
 
   while (1) {