--- a/tests/src/libirccd/command-plugin-reload/main.cpp	Mon Mar 26 20:46:02 2018 +0200
+++ b/tests/src/libirccd/command-plugin-reload/main.cpp	Tue Mar 27 20:12:02 2018 +0200
@@ -87,70 +87,37 @@
 
 BOOST_AUTO_TEST_CASE(invalid_identifier)
 {
-    boost::system::error_code result;
-    nlohmann::json message;
-
-    ctl_->send({
+    const auto result = request({
         { "command",    "plugin-reload" }
     });
-    ctl_->recv([&] (auto rresult, auto rmessage) {
-        result = rresult;
-        message = rmessage;
-    });
 
-    wait_for([&] {
-        return result;
-    });
-
-    BOOST_TEST(result == plugin_error::invalid_identifier);
-    BOOST_TEST(message["error"].template get<int>() == plugin_error::invalid_identifier);
-    BOOST_TEST(message["errorCategory"].template get<std::string>() == "plugin");
+    BOOST_TEST(result.second == plugin_error::invalid_identifier);
+    BOOST_TEST(result.first["error"].template get<int>() == plugin_error::invalid_identifier);
+    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "plugin");
 }
 
 BOOST_AUTO_TEST_CASE(not_found)
 {
-    boost::system::error_code result;
-    nlohmann::json message;
-
-    ctl_->send({
+    const auto result = request({
         { "command",    "plugin-reload" },
         { "plugin",     "unknown"       }
     });
-    ctl_->recv([&] (auto rresult, auto rmessage) {
-        result = rresult;
-        message = rmessage;
-    });
 
-    wait_for([&] {
-        return result;
-    });
-
-    BOOST_TEST(result == plugin_error::not_found);
-    BOOST_TEST(message["error"].template get<int>() == plugin_error::not_found);
-    BOOST_TEST(message["errorCategory"].template get<std::string>() == "plugin");
+    BOOST_TEST(result.second == plugin_error::not_found);
+    BOOST_TEST(result.first["error"].template get<int>() == plugin_error::not_found);
+    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "plugin");
 }
 
 BOOST_AUTO_TEST_CASE(exec_error)
 {
-    boost::system::error_code result;
-    nlohmann::json message;
-
-    ctl_->send({
+    const auto result = request({
         { "command",    "plugin-reload" },
         { "plugin",     "broken"        }
     });
-    ctl_->recv([&] (auto rresult, auto rmessage) {
-        result = rresult;
-        message = rmessage;
-    });
 
-    wait_for([&] {
-        return result;
-    });
-
-    BOOST_TEST(result == plugin_error::exec_error);
-    BOOST_TEST(message["error"].template get<int>() == plugin_error::exec_error);
-    BOOST_TEST(message["errorCategory"].template get<std::string>() == "plugin");
+    BOOST_TEST(result.second == plugin_error::exec_error);
+    BOOST_TEST(result.first["error"].template get<int>() == plugin_error::exec_error);
+    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "plugin");
 }
 
 BOOST_AUTO_TEST_SUITE_END()