--- a/tests/js-irccd/main.cpp	Fri Jun 03 13:28:10 2016 +0200
+++ b/tests/js-irccd/main.cpp	Sun Jun 05 10:50:55 2016 +0200
@@ -41,18 +41,21 @@
 TEST_F(TestJsIrccd, version)
 {
 	try {
-		auto ret = duk::pevalString(m_plugin->context(),
+		auto ret = duk_peval_string(m_plugin->context(),
 			"major = Irccd.version.major;"
 			"minor = Irccd.version.minor;"
 			"patch = Irccd.version.patch;"
 		);
 
 		if (ret != 0)
-			throw duk::exception(m_plugin->context(), -1);
+			throw dukx_exception(m_plugin->context(), -1);
 
-		ASSERT_EQ(IRCCD_VERSION_MAJOR, duk::getGlobal<int>(m_plugin->context(), "major"));
-		ASSERT_EQ(IRCCD_VERSION_MINOR, duk::getGlobal<int>(m_plugin->context(), "minor"));
-		ASSERT_EQ(IRCCD_VERSION_PATCH, duk::getGlobal<int>(m_plugin->context(), "patch"));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "major"));
+		ASSERT_EQ(IRCCD_VERSION_MAJOR, duk_get_int(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "minor"));
+		ASSERT_EQ(IRCCD_VERSION_MINOR, duk_get_int(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "patch"));
+		ASSERT_EQ(IRCCD_VERSION_PATCH, duk_get_int(m_plugin->context(), -1));
 	} catch (const std::exception &ex) {
 		FAIL() << ex.what();
 	}
@@ -61,7 +64,7 @@
 TEST_F(TestJsIrccd, fromJavascript)
 {
 	try {
-		auto ret = duk::pevalString(m_plugin->context(),
+		auto ret = duk_peval_string(m_plugin->context(),
 			"try {"
 			"  throw new Irccd.SystemError(1, 'test');"
 			"} catch (e) {"
@@ -74,13 +77,18 @@
 		);
 
 		if (ret != 0)
-			throw duk::exception(m_plugin->context(), -1);
+			throw dukx_exception(m_plugin->context(), -1);
 
-		ASSERT_EQ(1, duk::getGlobal<int>(m_plugin->context(), "errno"));
-		ASSERT_EQ("SystemError", duk::getGlobal<std::string>(m_plugin->context(), "name"));
-		ASSERT_EQ("test", duk::getGlobal<std::string>(m_plugin->context(), "message"));
-		ASSERT_TRUE(duk::getGlobal<bool>(m_plugin->context(), "v1"));
-		ASSERT_TRUE(duk::getGlobal<bool>(m_plugin->context(), "v2"));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "errno"));
+		ASSERT_EQ(1, duk_get_int(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "name"));
+		ASSERT_STREQ("SystemError", duk_get_string(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "message"));
+		ASSERT_STREQ("test", duk_get_string(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "v1"));
+		ASSERT_TRUE(duk_get_boolean(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "v2"));
+		ASSERT_TRUE(duk_get_boolean(m_plugin->context(), -1));
 	} catch (const std::exception &ex) {
 		FAIL() << ex.what();
 	}
@@ -89,15 +97,15 @@
 TEST_F(TestJsIrccd, fromNative)
 {
 	try {
-		duk::push(m_plugin->context(), duk::Function{[] (duk::Context *ctx) -> duk::Ret {
-			duk::raise(ctx, SystemError{EINVAL, "hey"});
+		duk_push_c_function(m_plugin->context(), [] (duk_context *ctx) -> duk_ret_t {
+			dukx_throw(ctx, SystemError(EINVAL, "hey"));
 
 			return 0;
-		}});
+		}, 0);
 
-		duk::putGlobal(m_plugin->context(), "f");
+		duk_put_global_string(m_plugin->context(), "f");
 
-		auto ret = duk::pevalString(m_plugin->context(),
+		auto ret = duk_peval_string(m_plugin->context(),
 			"try {"
 			"  f();"
 			"} catch (e) {"
@@ -110,13 +118,18 @@
 		);
 
 		if (ret != 0)
-			throw duk::exception(m_plugin->context(), -1);
+			throw dukx_exception(m_plugin->context(), -1);
 
-		ASSERT_EQ(EINVAL, duk::getGlobal<int>(m_plugin->context(), "errno"));
-		ASSERT_EQ("SystemError", duk::getGlobal<std::string>(m_plugin->context(), "name"));
-		ASSERT_EQ("hey", duk::getGlobal<std::string>(m_plugin->context(), "message"));
-		ASSERT_TRUE(duk::getGlobal<bool>(m_plugin->context(), "v1"));
-		ASSERT_TRUE(duk::getGlobal<bool>(m_plugin->context(), "v2"));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "errno"));
+		ASSERT_EQ(EINVAL, duk_get_int(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "name"));
+		ASSERT_STREQ("SystemError", duk_get_string(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "message"));
+		ASSERT_STREQ("hey", duk_get_string(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "v1"));
+		ASSERT_TRUE(duk_get_boolean(m_plugin->context(), -1));
+		ASSERT_TRUE(duk_get_global_string(m_plugin->context(), "v2"));
+		ASSERT_TRUE(duk_get_boolean(m_plugin->context(), -1));
 	} catch (const std::exception &ex) {
 		FAIL() << ex.what();
 	}