diff --git a/gentest/gentest-javascript.js b/gentest/gentest-javascript.js
index 668173cf..bee6a1d4 100644
--- a/gentest/gentest-javascript.js
+++ b/gentest/gentest-javascript.js
@@ -33,7 +33,7 @@ JavascriptEmitter.prototype = Object.create(Emitter.prototype, {
 
   emitPrologue:{value:function() {
     this.push([
-      'var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);',
+      'var Yoga = Yoga || require("../../dist");',
       ''
     ]);
   }},
diff --git a/javascript/tests/Facebook.Yoga/YGAbsolutePositionTest.js b/javascript/tests/Facebook.Yoga/YGAbsolutePositionTest.js
index 26f9b853..41f77c9b 100644
--- a/javascript/tests/Facebook.Yoga/YGAbsolutePositionTest.js
+++ b/javascript/tests/Facebook.Yoga/YGAbsolutePositionTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGAbsolutePositionTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("absolute_layout_width_height_start_top", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGAlignBaselineTest.js b/javascript/tests/Facebook.Yoga/YGAlignBaselineTest.js
index 828dbf14..39783bf3 100644
--- a/javascript/tests/Facebook.Yoga/YGAlignBaselineTest.js
+++ b/javascript/tests/Facebook.Yoga/YGAlignBaselineTest.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("align_baseline_parent_using_child_in_column_as_reference", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGAlignContentTest.js b/javascript/tests/Facebook.Yoga/YGAlignContentTest.js
index fb54f199..c07d35a7 100644
--- a/javascript/tests/Facebook.Yoga/YGAlignContentTest.js
+++ b/javascript/tests/Facebook.Yoga/YGAlignContentTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGAlignContentTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("align_content_flex_start", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGAlignItemsTest.js b/javascript/tests/Facebook.Yoga/YGAlignItemsTest.js
index 887c4d78..75cff235 100644
--- a/javascript/tests/Facebook.Yoga/YGAlignItemsTest.js
+++ b/javascript/tests/Facebook.Yoga/YGAlignItemsTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGAlignItemsTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("align_items_stretch", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGAlignSelfTest.js b/javascript/tests/Facebook.Yoga/YGAlignSelfTest.js
index e1e41950..318bde12 100644
--- a/javascript/tests/Facebook.Yoga/YGAlignSelfTest.js
+++ b/javascript/tests/Facebook.Yoga/YGAlignSelfTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGAlignSelfTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("align_self_center", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGAndroidNewsFeed.js b/javascript/tests/Facebook.Yoga/YGAndroidNewsFeed.js
index a5adc1e0..7f84876e 100644
--- a/javascript/tests/Facebook.Yoga/YGAndroidNewsFeed.js
+++ b/javascript/tests/Facebook.Yoga/YGAndroidNewsFeed.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGAndroidNewsFeed.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("android_news_feed", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGBorderTest.js b/javascript/tests/Facebook.Yoga/YGBorderTest.js
index 7b2861c0..67d32545 100644
--- a/javascript/tests/Facebook.Yoga/YGBorderTest.js
+++ b/javascript/tests/Facebook.Yoga/YGBorderTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGBorderTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("border_no_size", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGComputedBorderTest.js b/javascript/tests/Facebook.Yoga/YGComputedBorderTest.js
index a80fad7f..33102621 100644
--- a/javascript/tests/Facebook.Yoga/YGComputedBorderTest.js
+++ b/javascript/tests/Facebook.Yoga/YGComputedBorderTest.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("border_start", function () {
   var root = Yoga.Node.create();
diff --git a/javascript/tests/Facebook.Yoga/YGComputedMarginTest.js b/javascript/tests/Facebook.Yoga/YGComputedMarginTest.js
index 8ded6d5d..2f36d0ac 100644
--- a/javascript/tests/Facebook.Yoga/YGComputedMarginTest.js
+++ b/javascript/tests/Facebook.Yoga/YGComputedMarginTest.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("margin_start", function () {
   var root = Yoga.Node.create();
diff --git a/javascript/tests/Facebook.Yoga/YGComputedPaddingTest.js b/javascript/tests/Facebook.Yoga/YGComputedPaddingTest.js
index d5571b1d..43d10b01 100644
--- a/javascript/tests/Facebook.Yoga/YGComputedPaddingTest.js
+++ b/javascript/tests/Facebook.Yoga/YGComputedPaddingTest.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("padding_start", function () {
   var root = Yoga.Node.create();
diff --git a/javascript/tests/Facebook.Yoga/YGDimensionTest.js b/javascript/tests/Facebook.Yoga/YGDimensionTest.js
index c6018771..5f9f8235 100644
--- a/javascript/tests/Facebook.Yoga/YGDimensionTest.js
+++ b/javascript/tests/Facebook.Yoga/YGDimensionTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGDimensionTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("wrap_child", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGDirtiedTest.js b/javascript/tests/Facebook.Yoga/YGDirtiedTest.js
index fcfb305b..734c1c13 100644
--- a/javascript/tests/Facebook.Yoga/YGDirtiedTest.js
+++ b/javascript/tests/Facebook.Yoga/YGDirtiedTest.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("dirtied", function() {
   var root = Yoga.Node.create();
diff --git a/javascript/tests/Facebook.Yoga/YGDisplayTest.js b/javascript/tests/Facebook.Yoga/YGDisplayTest.js
index d874a4ba..3b128d22 100644
--- a/javascript/tests/Facebook.Yoga/YGDisplayTest.js
+++ b/javascript/tests/Facebook.Yoga/YGDisplayTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGDisplayTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("display_none", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGFlexDirectionTest.js b/javascript/tests/Facebook.Yoga/YGFlexDirectionTest.js
index e82ee4b6..b60bb81c 100644
--- a/javascript/tests/Facebook.Yoga/YGFlexDirectionTest.js
+++ b/javascript/tests/Facebook.Yoga/YGFlexDirectionTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGFlexDirectionTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("flex_direction_column_no_height", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGFlexTest.js b/javascript/tests/Facebook.Yoga/YGFlexTest.js
index 817d604a..0bb70d92 100644
--- a/javascript/tests/Facebook.Yoga/YGFlexTest.js
+++ b/javascript/tests/Facebook.Yoga/YGFlexTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGFlexTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("flex_basis_flex_grow_column", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGFlexWrapTest.js b/javascript/tests/Facebook.Yoga/YGFlexWrapTest.js
index 572ea959..8dfbf0c2 100644
--- a/javascript/tests/Facebook.Yoga/YGFlexWrapTest.js
+++ b/javascript/tests/Facebook.Yoga/YGFlexWrapTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGFlexWrapTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("wrap_column", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGGapTest.js b/javascript/tests/Facebook.Yoga/YGGapTest.js
index 07175f74..27e4797e 100644
--- a/javascript/tests/Facebook.Yoga/YGGapTest.js
+++ b/javascript/tests/Facebook.Yoga/YGGapTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGGapTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("column_gap_flexible", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGJustifyContentTest.js b/javascript/tests/Facebook.Yoga/YGJustifyContentTest.js
index 4fc2329b..7f2bd874 100644
--- a/javascript/tests/Facebook.Yoga/YGJustifyContentTest.js
+++ b/javascript/tests/Facebook.Yoga/YGJustifyContentTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGJustifyContentTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("justify_content_row_flex_start", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGMarginTest.js b/javascript/tests/Facebook.Yoga/YGMarginTest.js
index c1d8bab3..95dd9e2b 100644
--- a/javascript/tests/Facebook.Yoga/YGMarginTest.js
+++ b/javascript/tests/Facebook.Yoga/YGMarginTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGMarginTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("margin_start", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGMeasureCacheTest.js b/javascript/tests/Facebook.Yoga/YGMeasureCacheTest.js
index a14dee88..bad80bf6 100644
--- a/javascript/tests/Facebook.Yoga/YGMeasureCacheTest.js
+++ b/javascript/tests/Facebook.Yoga/YGMeasureCacheTest.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("measure_once_single_flexible_child", function () {
   var root = Yoga.Node.create();
diff --git a/javascript/tests/Facebook.Yoga/YGMeasureTest.js b/javascript/tests/Facebook.Yoga/YGMeasureTest.js
index 7b8fa8a5..34dfcfc4 100644
--- a/javascript/tests/Facebook.Yoga/YGMeasureTest.js
+++ b/javascript/tests/Facebook.Yoga/YGMeasureTest.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("dont_measure_single_grow_shrink_child", function () {
   var root = Yoga.Node.create();
diff --git a/javascript/tests/Facebook.Yoga/YGMinMaxDimensionTest.js b/javascript/tests/Facebook.Yoga/YGMinMaxDimensionTest.js
index ea7499cd..6535fcc7 100644
--- a/javascript/tests/Facebook.Yoga/YGMinMaxDimensionTest.js
+++ b/javascript/tests/Facebook.Yoga/YGMinMaxDimensionTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGMinMaxDimensionTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("max_width", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGPaddingTest.js b/javascript/tests/Facebook.Yoga/YGPaddingTest.js
index db0488ab..25b5d04d 100644
--- a/javascript/tests/Facebook.Yoga/YGPaddingTest.js
+++ b/javascript/tests/Facebook.Yoga/YGPaddingTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGPaddingTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("padding_no_size", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGPercentageTest.js b/javascript/tests/Facebook.Yoga/YGPercentageTest.js
index 17129fe3..81ad74b6 100644
--- a/javascript/tests/Facebook.Yoga/YGPercentageTest.js
+++ b/javascript/tests/Facebook.Yoga/YGPercentageTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGPercentageTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("percentage_width_height", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGRoundingTest.js b/javascript/tests/Facebook.Yoga/YGRoundingTest.js
index 4359eede..cd82225d 100644
--- a/javascript/tests/Facebook.Yoga/YGRoundingTest.js
+++ b/javascript/tests/Facebook.Yoga/YGRoundingTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGRoundingTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("rounding_flex_basis_flex_grow_row_width_of_100", function () {
   var config = Yoga.Config.create();
diff --git a/javascript/tests/Facebook.Yoga/YGSizeOverflowTest.js b/javascript/tests/Facebook.Yoga/YGSizeOverflowTest.js
index e68746a3..e996f2fc 100644
--- a/javascript/tests/Facebook.Yoga/YGSizeOverflowTest.js
+++ b/javascript/tests/Facebook.Yoga/YGSizeOverflowTest.js
@@ -7,7 +7,7 @@
 
 // @generated by gentest/gentest.rb from gentest/fixtures/YGSizeOverflowTest.html
 
-var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);
+var Yoga = Yoga || require("../../dist");
 
 it("nested_overflowing_child", function () {
   var config = Yoga.Config.create();