diff --git a/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp b/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
index 69f99c2..1d25d06 100644
--- a/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
+++ b/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
@@ -20,19 +20,20 @@ using RouteAuthRegistrationExecutor = AuthRegistrationExecutor<beast::http::stri
 
 BOOST_AUTO_TEST_CASE(AuthRegistrationExecutor_Succesful_Login)
 {
-  {
-    auto& args = boost::unit_test::framework::master_test_suite().argc;
-    auto& argv = boost::unit_test::framework::master_test_suite().argv;
+  auto& args = boost::unit_test::framework::master_test_suite().argc;
+  auto& argv = boost::unit_test::framework::master_test_suite().argv;
 
-    const std::string mysql_credentials = argv[1];
+  const std::string mysql_credentials = argv[1];
 
-    uad::SetMySqlSession(new mysqlx::Session(mysql_credentials));
+  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
 
-    auto user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
-    auto executor = make_shared<RouteAuthRegistrationExecutor>(GetMySqlSession(), user_dao);
+  uad::SetMySqlSession(mysql_session);
 
-    BOOST_CHECK(true == true);
-  }
+  auto user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
+  auto executor = make_shared<RouteAuthRegistrationExecutor>(GetMySqlSession(), user_dao);
 
-  delete &GetMySqlSession();
+  BOOST_CHECK(true == true);
+
+  mysql_session->close();
+  delete mysql_session;
 }