diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index ca9c6bbeaf..3bc8444d96 100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -187,7 +187,7 @@ DEFINE_bool(harmony_strings, false, "enable harmony string")
 DEFINE_bool(harmony_arrays, false, "enable harmony arrays")
 DEFINE_bool(harmony_maths, false, "enable harmony math functions")
 DEFINE_bool(harmony, false, "enable all harmony features (except typeof)")
-DEFINE_implication(harmony, es_staging)
+
 DEFINE_implication(harmony, harmony_scoping)
 DEFINE_implication(harmony, harmony_modules)
 DEFINE_implication(harmony, harmony_symbols)
@@ -199,10 +199,12 @@ DEFINE_implication(harmony, harmony_iteration)
 DEFINE_implication(harmony, harmony_numeric_literals)
 DEFINE_implication(harmony, harmony_strings)
 DEFINE_implication(harmony, harmony_arrays)
-DEFINE_implication(harmony, harmony_maths)
 DEFINE_implication(harmony_promises, harmony_collections)
 DEFINE_implication(harmony_modules, harmony_scoping)
 
+DEFINE_implication(harmony, es_staging)
+DEFINE_implication(es_staging, harmony_maths)
+
 // Flags for experimental implementation features.
 DEFINE_bool(packed_arrays, true, "optimizes arrays that have no holes")
 DEFINE_bool(smi_only_arrays, true, "tracks arrays with only smi values")
diff --git a/test/mjsunit/harmony/math-cbrt.js b/test/mjsunit/es6/math-cbrt.js
similarity index 100%
rename from test/mjsunit/harmony/math-cbrt.js
rename to test/mjsunit/es6/math-cbrt.js
diff --git a/test/mjsunit/harmony/math-clz32.js b/test/mjsunit/es6/math-clz32.js
similarity index 100%
rename from test/mjsunit/harmony/math-clz32.js
rename to test/mjsunit/es6/math-clz32.js
diff --git a/test/mjsunit/harmony/math-expm1.js b/test/mjsunit/es6/math-expm1.js
similarity index 100%
rename from test/mjsunit/harmony/math-expm1.js
rename to test/mjsunit/es6/math-expm1.js
diff --git a/test/mjsunit/harmony/math-fround.js b/test/mjsunit/es6/math-fround.js
similarity index 100%
rename from test/mjsunit/harmony/math-fround.js
rename to test/mjsunit/es6/math-fround.js
diff --git a/test/mjsunit/harmony/math-hyperbolic.js b/test/mjsunit/es6/math-hyperbolic.js
similarity index 100%
rename from test/mjsunit/harmony/math-hyperbolic.js
rename to test/mjsunit/es6/math-hyperbolic.js
diff --git a/test/mjsunit/harmony/math-hypot.js b/test/mjsunit/es6/math-hypot.js
similarity index 100%
rename from test/mjsunit/harmony/math-hypot.js
rename to test/mjsunit/es6/math-hypot.js
diff --git a/test/mjsunit/harmony/math-log1p.js b/test/mjsunit/es6/math-log1p.js
similarity index 100%
rename from test/mjsunit/harmony/math-log1p.js
rename to test/mjsunit/es6/math-log1p.js
diff --git a/test/mjsunit/harmony/math-log2-log10.js b/test/mjsunit/es6/math-log2-log10.js
similarity index 100%
rename from test/mjsunit/harmony/math-log2-log10.js
rename to test/mjsunit/es6/math-log2-log10.js
diff --git a/test/mjsunit/harmony/math-sign.js b/test/mjsunit/es6/math-sign.js
similarity index 100%
rename from test/mjsunit/harmony/math-sign.js
rename to test/mjsunit/es6/math-sign.js
diff --git a/test/mjsunit/harmony/math-trunc.js b/test/mjsunit/es6/math-trunc.js
similarity index 100%
rename from test/mjsunit/harmony/math-trunc.js
rename to test/mjsunit/es6/math-trunc.js