diff --git a/deps/chakrashim/include/v8.h b/deps/chakrashim/include/v8.h
index a6dec2d17db..7b7093c45f7 100644
--- a/deps/chakrashim/include/v8.h
+++ b/deps/chakrashim/include/v8.h
@@ -994,8 +994,7 @@ class V8_EXPORT StackFrame {
 
 enum class PromiseHookType { kInit, kResolve, kBefore, kAfter };
 
-typedef void(*PromiseHook)(PromiseHookType type, Local<Promise> promise,
-  Local<Value> parent);
+typedef void(*PromiseHook)(PromiseHookType type, Local<Promise> promise, Local<Value> parent);
 
 
 class V8_EXPORT Value : public Data {
diff --git a/test/addons-napi/test_async/test.js b/test/addons-napi/test_async/test.js
index eda6963743f..f6287b9d6b5 100644
--- a/test/addons-napi/test_async/test.js
+++ b/test/addons-napi/test_async/test.js
@@ -2,6 +2,13 @@
 const common = require('../../common');
 const assert = require('assert');
 const child_process = require('child_process');
+
+if (common.isChakraEngine) {
+  common.skip('Skipped for node-chakracore till #246 is fixed.');
+  return;
+}
+
+
 const test_async = require(`./build/${common.buildType}/test_async`);
 
 const testException = 'test_async_cb_exception';
diff --git a/test/addons-napi/test_make_callback_recurse/test.js b/test/addons-napi/test_make_callback_recurse/test.js
index 895769bc330..2fdb0733aad 100644
--- a/test/addons-napi/test_make_callback_recurse/test.js
+++ b/test/addons-napi/test_make_callback_recurse/test.js
@@ -6,6 +6,11 @@ const domain = require('domain');
 const binding = require(`./build/${common.buildType}/binding`);
 const makeCallback = binding.makeCallback;
 
+if (common.isChakraEngine) {
+  common.skip('Skipped for node-chakracore till #246 is fixed.');
+  return;
+}
+
 // Make sure this is run in the future.
 const mustCallCheckDomains = common.mustCall(checkDomains);
 
diff --git a/test/addons-napi/test_reference/test.js b/test/addons-napi/test_reference/test.js
index 30effe7eec0..e779dd09e44 100644
--- a/test/addons-napi/test_reference/test.js
+++ b/test/addons-napi/test_reference/test.js
@@ -4,6 +4,12 @@
 const common = require('../../common');
 const assert = require('assert');
 
+if (common.isChakraEngine) {
+  common.skip('Skipped for node-chakracore till #246 is fixed.');
+  return;
+}
+
+
 const test_reference = require(`./build/${common.buildType}/test_reference`);
 
 // This test script uses external values with finalizer callbacks
diff --git a/test/parallel/test-error-reporting.js b/test/parallel/test-error-reporting.js
index c4f59035d49..dcdc7c6810f 100644
--- a/test/parallel/test-error-reporting.js
+++ b/test/parallel/test-error-reporting.js
@@ -38,7 +38,7 @@ function errExec(script, callback) {
 
     if (!common.isChakraEngine) { // chakra does not output script
       // Assert the script is mentioned in error output.
-       assert.ok(stderr.includes(script));
+      assert.ok(stderr.includes(script));
     }
 
     // Proxy the args for more tests.
diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js
index 7a396ba577b..949b2524753 100644
--- a/test/parallel/test-repl.js
+++ b/test/parallel/test-repl.js
@@ -279,7 +279,7 @@ function error_test() {
       expect: prompt_multiline,
       chakracore: 'skip' },
     { client: client_unix, send: ')',
-      expect: `undefined\n${prompt_unix},
+      expect: `undefined\n${prompt_unix}`,
       chakracore: 'skip' },
     // npm prompt error message
     { client: client_unix, send: 'npm install foobar',
diff --git a/test/parallel/test-tls-wrap-event-emmiter.js b/test/parallel/test-tls-wrap-event-emmiter.js
index b468304249e..0dc150f5299 100644
--- a/test/parallel/test-tls-wrap-event-emmiter.js
+++ b/test/parallel/test-tls-wrap-event-emmiter.js
@@ -5,12 +5,15 @@
  * Test checks if we get exception instead of runtime error
  */
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
 const TlsSocket = require('tls').TLSSocket;
 const EventEmitter = require('events').EventEmitter;
 assert.throws(
   () => { new TlsSocket(new EventEmitter()); },
-  /^TypeError: this\.stream\.pause is not a function/
+  common.engineSpecificMessage({
+     v8: /^TypeError: this\.stream\.pause is not a function/,
+     chakracore: /^TypeError: Object doesn't support property or method 'pause'/
+  })
 );
diff --git a/test/testpy/__init__.py b/test/testpy/__init__.py
index c05d31df655..1234f0fe71b 100644
--- a/test/testpy/__init__.py
+++ b/test/testpy/__init__.py
@@ -174,9 +174,9 @@ def __init__(self, context, root, section, additional=None):
     super(AsyncHooksTestConfiguration, self).__init__(context, root, section,
                                                     additional)
 
-  def ListTests(self, current_path, path, arch, mode):
+  def ListTests(self, current_path, path, arch, mode, jsEngine):
     result = super(AsyncHooksTestConfiguration, self).ListTests(
-         current_path, path, arch, mode)
+         current_path, path, arch, mode, jsEngine)
     for test in result:
       test.parallel = True
     return result