--- a/irccd-test/main.cpp	Thu Dec 21 21:55:57 2017 +0100
+++ b/irccd-test/main.cpp	Thu Dec 21 22:01:10 2017 +0100
@@ -42,18 +42,7 @@
 #include <irccd/test/debug_server.hpp>
 
 #if defined(HAVE_JS)
-#   include <irccd/js/directory_jsapi.hpp>
-#   include <irccd/js/elapsed_timer_jsapi.hpp>
-#   include <irccd/js/file_jsapi.hpp>
-#   include <irccd/js/irccd_jsapi.hpp>
 #   include <irccd/js/js_plugin.hpp>
-#   include <irccd/js/logger_jsapi.hpp>
-#   include <irccd/js/plugin_jsapi.hpp>
-#   include <irccd/js/server_jsapi.hpp>
-#   include <irccd/js/system_jsapi.hpp>
-#   include <irccd/js/timer_jsapi.hpp>
-#   include <irccd/js/unicode_jsapi.hpp>
-#   include <irccd/js/util_jsapi.hpp>
 #endif
 
 namespace irccd {
@@ -501,21 +490,7 @@
     daemon = std::make_unique<irccd>(io);
 
 #if defined(HAVE_JS)
-    auto loader = std::make_unique<js_plugin_loader>(*daemon);
-
-    loader->modules().push_back(std::make_unique<irccd_jsapi>());
-    loader->modules().push_back(std::make_unique<directory_jsapi>());
-    loader->modules().push_back(std::make_unique<elapsed_timer_jsapi>());
-    loader->modules().push_back(std::make_unique<file_jsapi>());
-    loader->modules().push_back(std::make_unique<logger_jsapi>());
-    loader->modules().push_back(std::make_unique<plugin_jsapi>());
-    loader->modules().push_back(std::make_unique<server_jsapi>());
-    loader->modules().push_back(std::make_unique<system_jsapi>());
-    loader->modules().push_back(std::make_unique<timer_jsapi>());
-    loader->modules().push_back(std::make_unique<unicode_jsapi>());
-    loader->modules().push_back(std::make_unique<util_jsapi>());
-
-    daemon->plugins().add_loader(std::move(loader));
+    daemon->plugins().add_loader(js_plugin_loader::defaults(*daemon));
 #endif
 
     load_options(argc, argv);