diff --git a/test/built-ins/object/entries/exception-during-enumeration.js b/test/built-ins/Object/entries/exception-during-enumeration.js
similarity index 100%
rename from test/built-ins/object/entries/exception-during-enumeration.js
rename to test/built-ins/Object/entries/exception-during-enumeration.js
diff --git a/test/built-ins/object/entries/exception-not-object-coercible.js b/test/built-ins/Object/entries/exception-not-object-coercible.js
similarity index 100%
rename from test/built-ins/object/entries/exception-not-object-coercible.js
rename to test/built-ins/Object/entries/exception-not-object-coercible.js
diff --git a/test/built-ins/object/entries/function-length.js b/test/built-ins/Object/entries/function-length.js
similarity index 100%
rename from test/built-ins/object/entries/function-length.js
rename to test/built-ins/Object/entries/function-length.js
diff --git a/test/built-ins/object/entries/function-name.js b/test/built-ins/Object/entries/function-name.js
similarity index 100%
rename from test/built-ins/object/entries/function-name.js
rename to test/built-ins/Object/entries/function-name.js
diff --git a/test/built-ins/object/entries/function-property-descriptor.js b/test/built-ins/Object/entries/function-property-descriptor.js
similarity index 100%
rename from test/built-ins/object/entries/function-property-descriptor.js
rename to test/built-ins/Object/entries/function-property-descriptor.js
diff --git a/test/built-ins/object/entries/getter-adding-key.js b/test/built-ins/Object/entries/getter-adding-key.js
similarity index 100%
rename from test/built-ins/object/entries/getter-adding-key.js
rename to test/built-ins/Object/entries/getter-adding-key.js
diff --git a/test/built-ins/object/entries/getter-making-future-key-nonenumerable.js b/test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js
similarity index 100%
rename from test/built-ins/object/entries/getter-making-future-key-nonenumerable.js
rename to test/built-ins/Object/entries/getter-making-future-key-nonenumerable.js
diff --git a/test/built-ins/object/entries/getter-removing-future-key.js b/test/built-ins/Object/entries/getter-removing-future-key.js
similarity index 100%
rename from test/built-ins/object/entries/getter-removing-future-key.js
rename to test/built-ins/Object/entries/getter-removing-future-key.js
diff --git a/test/built-ins/object/entries/inherited-properties-omitted.js b/test/built-ins/Object/entries/inherited-properties-omitted.js
similarity index 100%
rename from test/built-ins/object/entries/inherited-properties-omitted.js
rename to test/built-ins/Object/entries/inherited-properties-omitted.js
diff --git a/test/built-ins/object/entries/primitive-booleans.js b/test/built-ins/Object/entries/primitive-booleans.js
similarity index 100%
rename from test/built-ins/object/entries/primitive-booleans.js
rename to test/built-ins/Object/entries/primitive-booleans.js
diff --git a/test/built-ins/object/entries/primitive-numbers.js b/test/built-ins/Object/entries/primitive-numbers.js
similarity index 100%
rename from test/built-ins/object/entries/primitive-numbers.js
rename to test/built-ins/Object/entries/primitive-numbers.js
diff --git a/test/built-ins/object/entries/primitive-strings.js b/test/built-ins/Object/entries/primitive-strings.js
similarity index 100%
rename from test/built-ins/object/entries/primitive-strings.js
rename to test/built-ins/Object/entries/primitive-strings.js
diff --git a/test/built-ins/object/entries/primitive-symbols.js b/test/built-ins/Object/entries/primitive-symbols.js
similarity index 100%
rename from test/built-ins/object/entries/primitive-symbols.js
rename to test/built-ins/Object/entries/primitive-symbols.js
diff --git a/test/built-ins/object/entries/symbols-omitted.js b/test/built-ins/Object/entries/symbols-omitted.js
similarity index 100%
rename from test/built-ins/object/entries/symbols-omitted.js
rename to test/built-ins/Object/entries/symbols-omitted.js
diff --git a/test/built-ins/object/entries/tamper-with-global-object.js b/test/built-ins/Object/entries/tamper-with-global-object.js
similarity index 100%
rename from test/built-ins/object/entries/tamper-with-global-object.js
rename to test/built-ins/Object/entries/tamper-with-global-object.js
diff --git a/test/built-ins/object/entries/tamper-with-object-keys.js b/test/built-ins/Object/entries/tamper-with-object-keys.js
similarity index 100%
rename from test/built-ins/object/entries/tamper-with-object-keys.js
rename to test/built-ins/Object/entries/tamper-with-object-keys.js
diff --git a/test/built-ins/object/values/exception-during-enumeration.js b/test/built-ins/Object/values/exception-during-enumeration.js
similarity index 100%
rename from test/built-ins/object/values/exception-during-enumeration.js
rename to test/built-ins/Object/values/exception-during-enumeration.js
diff --git a/test/built-ins/object/values/exception-not-object-coercible.js b/test/built-ins/Object/values/exception-not-object-coercible.js
similarity index 100%
rename from test/built-ins/object/values/exception-not-object-coercible.js
rename to test/built-ins/Object/values/exception-not-object-coercible.js
diff --git a/test/built-ins/object/values/function-length.js b/test/built-ins/Object/values/function-length.js
similarity index 100%
rename from test/built-ins/object/values/function-length.js
rename to test/built-ins/Object/values/function-length.js
diff --git a/test/built-ins/object/values/function-name.js b/test/built-ins/Object/values/function-name.js
similarity index 100%
rename from test/built-ins/object/values/function-name.js
rename to test/built-ins/Object/values/function-name.js
diff --git a/test/built-ins/object/values/function-property-descriptor.js b/test/built-ins/Object/values/function-property-descriptor.js
similarity index 100%
rename from test/built-ins/object/values/function-property-descriptor.js
rename to test/built-ins/Object/values/function-property-descriptor.js
diff --git a/test/built-ins/object/values/getter-adding-key.js b/test/built-ins/Object/values/getter-adding-key.js
similarity index 100%
rename from test/built-ins/object/values/getter-adding-key.js
rename to test/built-ins/Object/values/getter-adding-key.js
diff --git a/test/built-ins/object/values/getter-making-future-key-nonenumerable.js b/test/built-ins/Object/values/getter-making-future-key-nonenumerable.js
similarity index 100%
rename from test/built-ins/object/values/getter-making-future-key-nonenumerable.js
rename to test/built-ins/Object/values/getter-making-future-key-nonenumerable.js
diff --git a/test/built-ins/object/values/getter-removing-future-key.js b/test/built-ins/Object/values/getter-removing-future-key.js
similarity index 100%
rename from test/built-ins/object/values/getter-removing-future-key.js
rename to test/built-ins/Object/values/getter-removing-future-key.js
diff --git a/test/built-ins/object/values/inherited-properties-omitted.js b/test/built-ins/Object/values/inherited-properties-omitted.js
similarity index 100%
rename from test/built-ins/object/values/inherited-properties-omitted.js
rename to test/built-ins/Object/values/inherited-properties-omitted.js
diff --git a/test/built-ins/object/values/primitive-booleans.js b/test/built-ins/Object/values/primitive-booleans.js
similarity index 100%
rename from test/built-ins/object/values/primitive-booleans.js
rename to test/built-ins/Object/values/primitive-booleans.js
diff --git a/test/built-ins/object/values/primitive-numbers.js b/test/built-ins/Object/values/primitive-numbers.js
similarity index 100%
rename from test/built-ins/object/values/primitive-numbers.js
rename to test/built-ins/Object/values/primitive-numbers.js
diff --git a/test/built-ins/object/values/primitive-strings.js b/test/built-ins/Object/values/primitive-strings.js
similarity index 100%
rename from test/built-ins/object/values/primitive-strings.js
rename to test/built-ins/Object/values/primitive-strings.js
diff --git a/test/built-ins/object/values/primitive-symbols.js b/test/built-ins/Object/values/primitive-symbols.js
similarity index 100%
rename from test/built-ins/object/values/primitive-symbols.js
rename to test/built-ins/Object/values/primitive-symbols.js
diff --git a/test/built-ins/object/values/symbols-omitted.js b/test/built-ins/Object/values/symbols-omitted.js
similarity index 100%
rename from test/built-ins/object/values/symbols-omitted.js
rename to test/built-ins/Object/values/symbols-omitted.js
diff --git a/test/built-ins/object/values/tamper-with-global-object.js b/test/built-ins/Object/values/tamper-with-global-object.js
similarity index 100%
rename from test/built-ins/object/values/tamper-with-global-object.js
rename to test/built-ins/Object/values/tamper-with-global-object.js
diff --git a/test/built-ins/object/values/tamper-with-object-keys.js b/test/built-ins/Object/values/tamper-with-object-keys.js
similarity index 100%
rename from test/built-ins/object/values/tamper-with-object-keys.js
rename to test/built-ins/Object/values/tamper-with-object-keys.js