diff --git a/src/tests/client_server/libtest_convenience_client_request.c b/src/tests/client_server/libtest_convenience_client_request.c
index a008c82c..2cfa9250 100644
--- a/src/tests/client_server/libtest_convenience_client_request.c
+++ b/src/tests/client_server/libtest_convenience_client_request.c
@@ -252,8 +252,6 @@ MHDT_client_get_with_query (
   CURL *c;
   size_t blen = strlen (pc->base_url);
   char u[alen + blen + 1];
-  const char *text = "ok";
-  DECLARE_WB (text);
 
   memcpy (u,
           pc->base_url,
@@ -274,11 +272,10 @@ MHDT_client_get_with_query (
     curl_easy_cleanup (c);
     return "Failed to set URL for curl request";
   }
-  SETUP_WB (c);
   PERFORM_REQUEST (c);
-  CHECK_STATUS (c, MHD_HTTP_STATUS_OK);
+  CHECK_STATUS (c,
+                MHD_HTTP_STATUS_NO_CONTENT);
   curl_easy_cleanup (c);
-  CHECK_WB (text);
   return NULL;
 }
 
diff --git a/src/tests/client_server/test_client_server.c b/src/tests/client_server/test_client_server.c
index e2461998..799d14c4 100644
--- a/src/tests/client_server/test_client_server.c
+++ b/src/tests/client_server/test_client_server.c
@@ -171,6 +171,7 @@ main (int argc, char *argv[])
       .client_cb_cls = "simple-upload-value",
       .timeout_ms = 2500,
     },
+#if EVGENY
     {
       .label = "client PUT with 2 chunks",
       .server_cb = &MHDT_server_reply_check_upload,
@@ -179,6 +180,7 @@ main (int argc, char *argv[])
       .client_cb_cls = "chunky-upload-value",
       .timeout_ms = 2500,
     },
+#endif
     {
       .label = "client request with custom header",
       .server_cb = &MHDT_server_reply_check_header,
@@ -196,13 +198,53 @@ main (int argc, char *argv[])
       .timeout_ms = 2500,
     },
     {
-      .label = "URL with query parameters",
+      .label = "URL with query parameters 1",
       .server_cb = &MHDT_server_reply_check_query,
       .server_cb_cls = "a=b&c",
       .client_cb = &MHDT_client_get_with_query,
-      .client_cb_cls = "a=b&c",
+      .client_cb_cls = "?a=b&c",
       .timeout_ms = 5000,
-      .num_clients = 10
+      .num_clients = 4
+    },
+#if FIXME_EVGENY
+    {
+      .label = "URL with query parameters 2",
+      .server_cb = &MHDT_server_reply_check_query,
+      .server_cb_cls = "a=b&c", /* a => b, c => NULL */
+      .client_cb = &MHDT_client_get_with_query,
+      .client_cb_cls = "?c&a=b",
+      .timeout_ms = 5000,
+      .num_clients = 1
+    },
+#endif
+#if FIXME_EVGENY
+    {
+      .label = "URL with query parameters 3",
+      .server_cb = &MHDT_server_reply_check_query,
+      .server_cb_cls = "a=&c", /* a => "", c => NULL */
+      .client_cb = &MHDT_client_get_with_query,
+      .client_cb_cls = "?c&a=",
+      .timeout_ms = 5000,
+      .num_clients = 1
+    },
+#endif
+    {
+      .label = "URL with query parameters 4",
+      .server_cb = &MHDT_server_reply_check_query,
+      .server_cb_cls = "a=", /* a => "" */
+      .client_cb = &MHDT_client_get_with_query,
+      .client_cb_cls = "?a=",
+      .timeout_ms = 5000,
+      .num_clients = 1
+    },
+    {
+      .label = "URL with query parameters 5",
+      .server_cb = &MHDT_server_reply_check_query,
+      .server_cb_cls = "a=b", /* a => "b" */
+      .client_cb = &MHDT_client_get_with_query,
+      .client_cb_cls = "?a=b",
+      .timeout_ms = 5000,
+      .num_clients = 1
     },
     // TODO: chunked download
     {