diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-referenceerror.js b/test/language/expressions/class/fields-evaluation-error/computed-name-referenceerror.js
similarity index 100%
rename from test/language/expressions/class/fields-evaluation-error-computed-name-referenceerror.js
rename to test/language/expressions/class/fields-evaluation-error/computed-name-referenceerror.js
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-err.js b/test/language/expressions/class/fields-evaluation-error/computed-name-toprimitive-err.js
similarity index 100%
rename from test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-err.js
rename to test/language/expressions/class/fields-evaluation-error/computed-name-toprimitive-err.js
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-returns-noncallable.js b/test/language/expressions/class/fields-evaluation-error/computed-name-toprimitive-returns-noncallable.js
similarity index 100%
rename from test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-returns-noncallable.js
rename to test/language/expressions/class/fields-evaluation-error/computed-name-toprimitive-returns-noncallable.js
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-returns-nonobject.js b/test/language/expressions/class/fields-evaluation-error/computed-name-toprimitive-returns-nonobject.js
similarity index 100%
rename from test/language/expressions/class/fields-evaluation-error-computed-name-toprimitive-returns-nonobject.js
rename to test/language/expressions/class/fields-evaluation-error/computed-name-toprimitive-returns-nonobject.js
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-tostring-err.js b/test/language/expressions/class/fields-evaluation-error/computed-name-tostring-err.js
similarity index 100%
rename from test/language/expressions/class/fields-evaluation-error-computed-name-tostring-err.js
rename to test/language/expressions/class/fields-evaluation-error/computed-name-tostring-err.js
diff --git a/test/language/expressions/class/fields-evaluation-error-computed-name-valueof-err.js b/test/language/expressions/class/fields-evaluation-error/computed-name-valueof-err.js
similarity index 100%
rename from test/language/expressions/class/fields-evaluation-error-computed-name-valueof-err.js
rename to test/language/expressions/class/fields-evaluation-error/computed-name-valueof-err.js
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-referenceerror.js b/test/language/statements/class/fields-evaluation-error/computed-name-referenceerror.js
similarity index 100%
rename from test/language/statements/class/fields-evaluation-error-computed-name-referenceerror.js
rename to test/language/statements/class/fields-evaluation-error/computed-name-referenceerror.js
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-err.js b/test/language/statements/class/fields-evaluation-error/computed-name-toprimitive-err.js
similarity index 100%
rename from test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-err.js
rename to test/language/statements/class/fields-evaluation-error/computed-name-toprimitive-err.js
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-returns-noncallable.js b/test/language/statements/class/fields-evaluation-error/computed-name-toprimitive-returns-noncallable.js
similarity index 100%
rename from test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-returns-noncallable.js
rename to test/language/statements/class/fields-evaluation-error/computed-name-toprimitive-returns-noncallable.js
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-returns-nonobject.js b/test/language/statements/class/fields-evaluation-error/computed-name-toprimitive-returns-nonobject.js
similarity index 100%
rename from test/language/statements/class/fields-evaluation-error-computed-name-toprimitive-returns-nonobject.js
rename to test/language/statements/class/fields-evaluation-error/computed-name-toprimitive-returns-nonobject.js
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-tostring-err.js b/test/language/statements/class/fields-evaluation-error/computed-name-tostring-err.js
similarity index 100%
rename from test/language/statements/class/fields-evaluation-error-computed-name-tostring-err.js
rename to test/language/statements/class/fields-evaluation-error/computed-name-tostring-err.js
diff --git a/test/language/statements/class/fields-evaluation-error-computed-name-valueof-err.js b/test/language/statements/class/fields-evaluation-error/computed-name-valueof-err.js
similarity index 100%
rename from test/language/statements/class/fields-evaluation-error-computed-name-valueof-err.js
rename to test/language/statements/class/fields-evaluation-error/computed-name-valueof-err.js