--- a/tests/src/libirccd/command-server-list/main.cpp	Mon Mar 26 20:46:02 2018 +0200
+++ b/tests/src/libirccd/command-server-list/main.cpp	Tue Mar 27 20:12:02 2018 +0200
@@ -44,22 +44,15 @@
 
 BOOST_AUTO_TEST_CASE(basic)
 {
-    nlohmann::json result;
-
-    ctl_->send({{"command", "server-list"}});
-    ctl_->recv([&] (auto, auto msg) {
-        result = msg;
+    const auto result = request({
+        { "command", "server-list" }
     });
 
-    wait_for([&] () {
-        return result.is_object();
-    });
-
-    BOOST_TEST(result.is_object());
-    BOOST_TEST(result["list"].is_array());
-    BOOST_TEST(result["list"].size() == 2U);
-    BOOST_TEST(result["list"][0].get<std::string>() == "s1");
-    BOOST_TEST(result["list"][1].get<std::string>() == "s2");
+    BOOST_TEST(result.first.is_object());
+    BOOST_TEST(result.first["list"].is_array());
+    BOOST_TEST(result.first["list"].size() == 2U);
+    BOOST_TEST(result.first["list"][0].get<std::string>() == "s1");
+    BOOST_TEST(result.first["list"][1].get<std::string>() == "s2");
 }
 
 BOOST_AUTO_TEST_SUITE_END()