diff --git a/test/language/expressions/async-generator/return-suspendedStart-promise.js b/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedStart-promise.js
similarity index 100%
rename from test/language/expressions/async-generator/return-suspendedStart-promise.js
rename to test/built-ins/AsyncGeneratorPrototype/return/return-suspendedStart-promise.js
diff --git a/test/language/expressions/async-generator/return-suspendedStart.js b/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedStart.js
similarity index 100%
rename from test/language/expressions/async-generator/return-suspendedStart.js
rename to test/built-ins/AsyncGeneratorPrototype/return/return-suspendedStart.js
diff --git a/test/language/expressions/async-generator/return-suspendedYield-promise.js b/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-promise.js
similarity index 100%
rename from test/language/expressions/async-generator/return-suspendedYield-promise.js
rename to test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-promise.js
diff --git a/test/language/expressions/async-generator/return-suspendedYield-try-finally-return.js b/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-try-finally-return.js
similarity index 100%
rename from test/language/expressions/async-generator/return-suspendedYield-try-finally-return.js
rename to test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-try-finally-return.js
diff --git a/test/language/expressions/async-generator/return-suspendedYield-try-finally-throw.js b/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-try-finally-throw.js
similarity index 100%
rename from test/language/expressions/async-generator/return-suspendedYield-try-finally-throw.js
rename to test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-try-finally-throw.js
diff --git a/test/language/expressions/async-generator/return-suspendedYield-try-finally.js b/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-try-finally.js
similarity index 100%
rename from test/language/expressions/async-generator/return-suspendedYield-try-finally.js
rename to test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield-try-finally.js
diff --git a/test/language/expressions/async-generator/return-suspendedYield.js b/test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield.js
similarity index 100%
rename from test/language/expressions/async-generator/return-suspendedYield.js
rename to test/built-ins/AsyncGeneratorPrototype/return/return-suspendedYield.js
diff --git a/test/language/expressions/async-generator/throw-suspendedStart-promise.js b/test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedStart-promise.js
similarity index 100%
rename from test/language/expressions/async-generator/throw-suspendedStart-promise.js
rename to test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedStart-promise.js
diff --git a/test/language/expressions/async-generator/throw-suspendedStart.js b/test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedStart.js
similarity index 100%
rename from test/language/expressions/async-generator/throw-suspendedStart.js
rename to test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedStart.js
diff --git a/test/language/expressions/async-generator/throw-suspendedYield-promise.js b/test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-promise.js
similarity index 100%
rename from test/language/expressions/async-generator/throw-suspendedYield-promise.js
rename to test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-promise.js
diff --git a/test/language/expressions/async-generator/throw-suspendedYield-try-catch.js b/test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-try-catch.js
similarity index 100%
rename from test/language/expressions/async-generator/throw-suspendedYield-try-catch.js
rename to test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-try-catch.js
diff --git a/test/language/expressions/async-generator/throw-suspendedYield-try-finally-return.js b/test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-try-finally-return.js
similarity index 100%
rename from test/language/expressions/async-generator/throw-suspendedYield-try-finally-return.js
rename to test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-try-finally-return.js
diff --git a/test/language/expressions/async-generator/throw-suspendedYield-try-finally-throw.js b/test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-try-finally-throw.js
similarity index 100%
rename from test/language/expressions/async-generator/throw-suspendedYield-try-finally-throw.js
rename to test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-try-finally-throw.js
diff --git a/test/language/expressions/async-generator/throw-suspendedYield-try-finally.js b/test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-try-finally.js
similarity index 100%
rename from test/language/expressions/async-generator/throw-suspendedYield-try-finally.js
rename to test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield-try-finally.js
diff --git a/test/language/expressions/async-generator/throw-suspendedYield.js b/test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield.js
similarity index 100%
rename from test/language/expressions/async-generator/throw-suspendedYield.js
rename to test/built-ins/AsyncGeneratorPrototype/throw/throw-suspendedYield.js