diff --git a/test/js-native-api/2_function_arguments/binding.c b/test/js-native-api/2_function_arguments/2_function_arguments.c
similarity index 100%
rename from test/js-native-api/2_function_arguments/binding.c
rename to test/js-native-api/2_function_arguments/2_function_arguments.c
diff --git a/test/js-native-api/2_function_arguments/binding.gyp b/test/js-native-api/2_function_arguments/binding.gyp
index 2a144bab42827e..7e35a4c9d6dc05 100644
--- a/test/js-native-api/2_function_arguments/binding.gyp
+++ b/test/js-native-api/2_function_arguments/binding.gyp
@@ -1,10 +1,10 @@
 {
   "targets": [
     {
-      "target_name": "binding",
+      "target_name": "2_function_arguments",
       "sources": [
         "../entry_point.c",
-        "binding.c"
+        "2_function_arguments.c"
       ]
     }
   ]
diff --git a/test/js-native-api/2_function_arguments/test.js b/test/js-native-api/2_function_arguments/test.js
index e70f76b718bd10..bf0ecabac3b7a0 100644
--- a/test/js-native-api/2_function_arguments/test.js
+++ b/test/js-native-api/2_function_arguments/test.js
@@ -1,6 +1,6 @@
 'use strict';
 const common = require('../../common');
 const assert = require('assert');
-const addon = require(`./build/${common.buildType}/binding`);
+const addon = require(`./build/${common.buildType}/2_function_arguments`);
 
 assert.strictEqual(addon.add(3, 5), 8);
diff --git a/test/js-native-api/3_callbacks/binding.c b/test/js-native-api/3_callbacks/3_callbacks.c
similarity index 100%
rename from test/js-native-api/3_callbacks/binding.c
rename to test/js-native-api/3_callbacks/3_callbacks.c
diff --git a/test/js-native-api/3_callbacks/binding.gyp b/test/js-native-api/3_callbacks/binding.gyp
index 2a144bab42827e..3cc662c4076dc1 100644
--- a/test/js-native-api/3_callbacks/binding.gyp
+++ b/test/js-native-api/3_callbacks/binding.gyp
@@ -1,10 +1,10 @@
 {
   "targets": [
     {
-      "target_name": "binding",
+      "target_name": "3_callbacks",
       "sources": [
         "../entry_point.c",
-        "binding.c"
+        "3_callbacks.c"
       ]
     }
   ]
diff --git a/test/js-native-api/3_callbacks/test.js b/test/js-native-api/3_callbacks/test.js
index 25e070d9744529..b84d3fbc9ddec0 100644
--- a/test/js-native-api/3_callbacks/test.js
+++ b/test/js-native-api/3_callbacks/test.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../../common');
 const assert = require('assert');
-const addon = require(`./build/${common.buildType}/binding`);
+const addon = require(`./build/${common.buildType}/3_callbacks`);
 
 addon.RunCallback(function(msg) {
   assert.strictEqual(msg, 'hello world');
diff --git a/test/js-native-api/4_object_factory/binding.c b/test/js-native-api/4_object_factory/4_object_factory.c
similarity index 100%
rename from test/js-native-api/4_object_factory/binding.c
rename to test/js-native-api/4_object_factory/4_object_factory.c
diff --git a/test/js-native-api/4_object_factory/binding.gyp b/test/js-native-api/4_object_factory/binding.gyp
index 2a144bab42827e..6cb3a9fa68b48a 100644
--- a/test/js-native-api/4_object_factory/binding.gyp
+++ b/test/js-native-api/4_object_factory/binding.gyp
@@ -1,10 +1,10 @@
 {
   "targets": [
     {
-      "target_name": "binding",
+      "target_name": "4_object_factory",
       "sources": [
         "../entry_point.c",
-        "binding.c"
+        "4_object_factory.c"
       ]
     }
   ]
diff --git a/test/js-native-api/4_object_factory/test.js b/test/js-native-api/4_object_factory/test.js
index 15313c1547f24b..16cad91753d40e 100644
--- a/test/js-native-api/4_object_factory/test.js
+++ b/test/js-native-api/4_object_factory/test.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../../common');
 const assert = require('assert');
-const addon = require(`./build/${common.buildType}/binding`);
+const addon = require(`./build/${common.buildType}/4_object_factory`);
 
 const obj1 = addon('hello');
 const obj2 = addon('world');
diff --git a/test/js-native-api/5_function_factory/binding.c b/test/js-native-api/5_function_factory/5_function_factory.c
similarity index 100%
rename from test/js-native-api/5_function_factory/binding.c
rename to test/js-native-api/5_function_factory/5_function_factory.c
diff --git a/test/js-native-api/5_function_factory/binding.gyp b/test/js-native-api/5_function_factory/binding.gyp
index 2a144bab42827e..c621c29f185cab 100644
--- a/test/js-native-api/5_function_factory/binding.gyp
+++ b/test/js-native-api/5_function_factory/binding.gyp
@@ -1,10 +1,10 @@
 {
   "targets": [
     {
-      "target_name": "binding",
+      "target_name": "5_function_factory",
       "sources": [
         "../entry_point.c",
-        "binding.c"
+        "5_function_factory.c"
       ]
     }
   ]
diff --git a/test/js-native-api/5_function_factory/test.js b/test/js-native-api/5_function_factory/test.js
index 7521824e1e000a..9d4772985c2a40 100644
--- a/test/js-native-api/5_function_factory/test.js
+++ b/test/js-native-api/5_function_factory/test.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../../common');
 const assert = require('assert');
-const addon = require(`./build/${common.buildType}/binding`);
+const addon = require(`./build/${common.buildType}/5_function_factory`);
 
 const fn = addon();
 assert.strictEqual(fn(), 'hello world'); // 'hello world'
diff --git a/test/js-native-api/6_object_wrap/myobject.cc b/test/js-native-api/6_object_wrap/6_object_wrap.cc
similarity index 100%
rename from test/js-native-api/6_object_wrap/myobject.cc
rename to test/js-native-api/6_object_wrap/6_object_wrap.cc
diff --git a/test/js-native-api/6_object_wrap/binding.gyp b/test/js-native-api/6_object_wrap/binding.gyp
index 0456804aaff8b9..2807d6a1572529 100644
--- a/test/js-native-api/6_object_wrap/binding.gyp
+++ b/test/js-native-api/6_object_wrap/binding.gyp
@@ -1,10 +1,10 @@
 {
   "targets": [
     {
-      "target_name": "binding",
+      "target_name": "6_object_wrap",
       "sources": [
         "../entry_point.c",
-        "myobject.cc"
+        "6_object_wrap.cc"
       ]
     }
   ]
diff --git a/test/js-native-api/6_object_wrap/test.js b/test/js-native-api/6_object_wrap/test.js
index f3535969c60fea..c113a47299f95c 100644
--- a/test/js-native-api/6_object_wrap/test.js
+++ b/test/js-native-api/6_object_wrap/test.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../../common');
 const assert = require('assert');
-const addon = require(`./build/${common.buildType}/binding`);
+const addon = require(`./build/${common.buildType}/6_object_wrap`);
 
 const getterOnlyErrorRE =
   /^TypeError: Cannot set property .* of #<.*> which has only a getter$/;
diff --git a/test/js-native-api/7_factory_wrap/binding.cc b/test/js-native-api/7_factory_wrap/7_factory_wrap.cc
similarity index 100%
rename from test/js-native-api/7_factory_wrap/binding.cc
rename to test/js-native-api/7_factory_wrap/7_factory_wrap.cc
diff --git a/test/js-native-api/7_factory_wrap/binding.gyp b/test/js-native-api/7_factory_wrap/binding.gyp
index 4071c9fe8cf87a..f9096674a70b5c 100644
--- a/test/js-native-api/7_factory_wrap/binding.gyp
+++ b/test/js-native-api/7_factory_wrap/binding.gyp
@@ -1,10 +1,10 @@
 {
   "targets": [
     {
-      "target_name": "binding",
+      "target_name": "7_factory_wrap",
       "sources": [
         "../entry_point.c",
-        "binding.cc",
+        "7_factory_wrap.cc",
         "myobject.cc"
       ]
     }
diff --git a/test/js-native-api/7_factory_wrap/test.js b/test/js-native-api/7_factory_wrap/test.js
index ff1516eaa5a092..fd9771d43bbed0 100644
--- a/test/js-native-api/7_factory_wrap/test.js
+++ b/test/js-native-api/7_factory_wrap/test.js
@@ -3,7 +3,7 @@
 
 const common = require('../../common');
 const assert = require('assert');
-const test = require(`./build/${common.buildType}/binding`);
+const test = require(`./build/${common.buildType}/7_factory_wrap`);
 
 assert.strictEqual(test.finalizeCount, 0);
 async function runGCTests() {
diff --git a/test/js-native-api/8_passing_wrapped/binding.cc b/test/js-native-api/8_passing_wrapped/8_passing_wrapped.cc
similarity index 100%
rename from test/js-native-api/8_passing_wrapped/binding.cc
rename to test/js-native-api/8_passing_wrapped/8_passing_wrapped.cc
diff --git a/test/js-native-api/8_passing_wrapped/binding.gyp b/test/js-native-api/8_passing_wrapped/binding.gyp
index 4071c9fe8cf87a..f85cc4cc97ae45 100644
--- a/test/js-native-api/8_passing_wrapped/binding.gyp
+++ b/test/js-native-api/8_passing_wrapped/binding.gyp
@@ -1,10 +1,10 @@
 {
   "targets": [
     {
-      "target_name": "binding",
+      "target_name": "8_passing_wrapped",
       "sources": [
         "../entry_point.c",
-        "binding.cc",
+        "8_passing_wrapped.cc",
         "myobject.cc"
       ]
     }
diff --git a/test/js-native-api/8_passing_wrapped/test.js b/test/js-native-api/8_passing_wrapped/test.js
index 54c829d9c77dff..d6da19fecd4de8 100644
--- a/test/js-native-api/8_passing_wrapped/test.js
+++ b/test/js-native-api/8_passing_wrapped/test.js
@@ -3,7 +3,7 @@
 
 const common = require('../../common');
 const assert = require('assert');
-const addon = require(`./build/${common.buildType}/binding`);
+const addon = require(`./build/${common.buildType}/8_passing_wrapped`);
 
 async function runTest() {
   let obj1 = addon.createObject(10);
diff --git a/test/js-native-api/test_new_target/binding.gyp b/test/js-native-api/test_new_target/binding.gyp
index dc050e6839b465..f9cc6e83758ced 100644
--- a/test/js-native-api/test_new_target/binding.gyp
+++ b/test/js-native-api/test_new_target/binding.gyp
@@ -1,11 +1,11 @@
 {
   'targets': [
     {
-      'target_name': 'binding',
+      'target_name': 'test_new_target',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [
         '../entry_point.c',
-        'binding.c'
+        'test_new_target.c'
       ]
     }
   ]
diff --git a/test/js-native-api/test_new_target/test.js b/test/js-native-api/test_new_target/test.js
index 702e8ca8b4387d..02d610e1e09734 100644
--- a/test/js-native-api/test_new_target/test.js
+++ b/test/js-native-api/test_new_target/test.js
@@ -2,7 +2,7 @@
 
 const common = require('../../common');
 const assert = require('assert');
-const binding = require(`./build/${common.buildType}/binding`);
+const binding = require(`./build/${common.buildType}/test_new_target`);
 
 class Class extends binding.BaseClass {
   constructor() {
diff --git a/test/js-native-api/test_new_target/binding.c b/test/js-native-api/test_new_target/test_new_target.c
similarity index 100%
rename from test/js-native-api/test_new_target/binding.c
rename to test/js-native-api/test_new_target/test_new_target.c