diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt
index 3665bfdec..626a75f3e 100644
--- a/server/core/test/CMakeLists.txt
+++ b/server/core/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${ERRMSG} ${CMAKE_CURRENT_BINARY_DIR})
 add_executable(test_mysql_users test_mysql_users.c)
 add_executable(test_hash testhash.c)
 add_executable(test_hint testhint.c)
diff --git a/server/core/test/testfeedback.c b/server/core/test/testfeedback.c
index 90c7c4a6d..6549305c3 100644
--- a/server/core/test/testfeedback.c
+++ b/server/core/test/testfeedback.c
@@ -44,8 +44,8 @@
 static char* server_options[] = {
     "MariaDB Corporation MaxScale",
     "--no-defaults",
-    "--datadir=",
-    "--language=",
+    "--datadir=.",
+    "--language=.",
     "--skip-innodb",
     "--default-storage-engine=myisam",
     NULL
@@ -88,7 +88,10 @@ int main(int argc, char** argv)
     printf("Config: %s\n",cnf);
 
 
-        mysql_library_init(num_elements, server_options, server_groups);
+       if(mysql_library_init(num_elements, server_options, server_groups))
+       {
+	   FAILTEST("Failed to initialize embedded library.");
+       }
 
     config_load(cnf);
 
@@ -111,6 +114,6 @@ int main(int argc, char** argv)
         {
                 FAILTEST("Http send failed\n");
         }
-
+    mysql_library_end();
     return 0;
 }
\ No newline at end of file