diff --git a/test/addons-napi/test_handle_scope/binding.gyp b/test/addons-napi/test_handle_scope/binding.gyp
new file mode 100644
index 0000000000..daa96681a5
--- /dev/null
+++ b/test/addons-napi/test_handle_scope/binding.gyp
@@ -0,0 +1,8 @@
+{
+  "targets": [
+    {
+      "target_name": "test_handle_scope",
+      "sources": [ "test_handle_scope.c" ]
+    }
+  ]
+}
diff --git a/test/addons-napi/test_handle_scope/test.js b/test/addons-napi/test_handle_scope/test.js
new file mode 100644
index 0000000000..ed52410f80
--- /dev/null
+++ b/test/addons-napi/test_handle_scope/test.js
@@ -0,0 +1,10 @@
+'use strict';
+const common = require('../../common');
+const assert = require('assert');
+
+// testing handle scope api calls
+const testHandleScope =
+    require(`./build/${common.buildType}/test_handle_scope`);
+
+testHandleScope.NewScope();
+assert.ok(testHandleScope.NewScopeEscape() instanceof Object);
diff --git a/test/addons-napi/test_handle_scope/test_handle_scope.c b/test/addons-napi/test_handle_scope/test_handle_scope.c
new file mode 100644
index 0000000000..f88c04705e
--- /dev/null
+++ b/test/addons-napi/test_handle_scope/test_handle_scope.c
@@ -0,0 +1,42 @@
+#include <node_api.h>
+#include "../common.h"
+#include <string.h>
+
+// these tests validate the handle scope functions in the normal
+// flow.  Forcing gc behaviour to fully validate they are doing
+// the right right thing would be quite hard so we keep it
+// simple for now.
+
+napi_value NewScope(napi_env env, napi_callback_info info) {
+  napi_handle_scope scope;
+  napi_value output = NULL;
+
+  NAPI_CALL(env, napi_open_handle_scope(env, &scope));
+  NAPI_CALL(env, napi_create_object(env, &output));
+  NAPI_CALL(env, napi_close_handle_scope(env, scope));
+  return NULL;
+}
+
+napi_value NewScopeEscape(napi_env env, napi_callback_info info) {
+  napi_escapable_handle_scope scope;
+  napi_value output = NULL;
+  napi_value escapee = NULL;
+
+  NAPI_CALL(env, napi_open_escapable_handle_scope(env, &scope));
+  NAPI_CALL(env, napi_create_object(env, &output));
+  NAPI_CALL(env, napi_escape_handle(env, scope, output, &escapee));
+  NAPI_CALL(env, napi_close_escapable_handle_scope(env, scope));
+  return escapee;
+}
+
+void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
+  napi_property_descriptor properties[] = {
+    DECLARE_NAPI_PROPERTY("NewScope", NewScope),
+    DECLARE_NAPI_PROPERTY("NewScopeEscape", NewScopeEscape),
+  };
+
+  NAPI_CALL_RETURN_VOID(env, napi_define_properties(
+    env, exports, sizeof(properties) / sizeof(*properties), properties));
+}
+
+NAPI_MODULE(addon, Init)