diff --git a/test/staging/Intl402/Temporal/old/islamic-calendars.js b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-civil.js
similarity index 100%
rename from test/staging/Intl402/Temporal/old/islamic-calendars.js
rename to test/staging/Intl402/Temporal/old/islamic-calendars-islamic-civil.js
diff --git a/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-rgsa.js b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-rgsa.js
new file mode 100644
index 0000000000..b09dc3f1b4
--- /dev/null
+++ b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-rgsa.js
@@ -0,0 +1,104 @@
+// Copyright (C) 2023 Justin Grant. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal-intl
+description: Islamic calendars (note there are 5 variants)
+features: [Temporal]
+---*/
+
+// Test data obtained from ICU
+
+const tests = [
+  {
+    calendar: "islamic",
+    choices: [
+      // Approximations of the observational Islamic calendar as computed by ICU4C.
+      {
+        inLeapYear: false,
+        daysInYear: 354,
+        daysInMonth12: 29,
+        isoDate: "2023-07-18",
+      },
+
+      // Approximations of the observational Islamic calendar as computed by ICU4X.
+      {
+        inLeapYear: true,
+        daysInYear: 355,
+        daysInMonth12: 30,
+        isoDate: "2023-07-19",
+      }
+    ],
+  },
+  {
+    calendar: "islamic-umalqura",
+    inLeapYear: false,
+    daysInYear: 354,
+    daysInMonth12: 30,
+    isoDate: "2023-07-19",
+  },
+  {
+    calendar: "islamic-civil",
+    inLeapYear: true,
+    daysInYear: 355,
+    daysInMonth12: 30,
+    isoDate: "2023-07-19",
+  },
+  {
+    calendar: "islamic-rgsa",
+    choices: [
+      // Approximations of the observational Islamic calendar as computed by ICU4C.
+      {
+        inLeapYear: false,
+        daysInYear: 354,
+        daysInMonth12: 29,
+        isoDate: "2023-07-18",
+      },
+
+      // Approximations of the observational Islamic calendar as computed by ICU4X.
+      {
+        inLeapYear: true,
+        daysInYear: 355,
+        daysInMonth12: 30,
+        isoDate: "2023-07-19",
+      }
+    ],
+  },
+  {
+    calendar: "islamic-tbla",
+    inLeapYear: true,
+    daysInYear: 355,
+    daysInMonth12: 30,
+    isoDate: "2023-07-18",
+  }
+];
+
+for (const test of tests) {
+  const { calendar, choices = [test] } = test;
+  const year = 1445;
+  const date = Temporal.PlainDate.from({ year, month: 1, day: 1, calendar });
+  assert.sameValue(date.calendarId, calendar);
+  assert.sameValue(date.year, year);
+  assert.sameValue(date.month, 1);
+  assert.sameValue(date.monthCode, "M01");
+  assert.sameValue(date.day, 1);
+
+  // Match the possible choice by comparing the ISO date value.
+  const choice = choices.find(({ isoDate }) => {
+    return date.toString().startsWith(isoDate);
+  });
+  assert(choice !== undefined, `No applicable choice found for calendar: ${calendar}`);
+
+  const { inLeapYear, daysInYear, daysInMonth12, isoDate } = choice;
+
+  assert.sameValue(date.inLeapYear, inLeapYear);
+  assert.sameValue(date.daysInYear, daysInYear);
+  assert.sameValue(date.monthsInYear, 12);
+  assert.sameValue(date.dayOfYear, 1);
+  const startOfNextYear = date.with({ year: year + 1 });
+  const lastDayOfThisYear = startOfNextYear.subtract({ days: 1 });
+  assert.sameValue(lastDayOfThisYear.dayOfYear, daysInYear);
+  const dateMonth12 = date.with({ month: 12 });
+  assert.sameValue(dateMonth12.daysInMonth, daysInMonth12);
+  assert.sameValue(date.toString(), `${isoDate}[u-ca=${calendar}]`, "ISO reference date");
+}
diff --git a/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-tbla.js b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-tbla.js
new file mode 100644
index 0000000000..b09dc3f1b4
--- /dev/null
+++ b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-tbla.js
@@ -0,0 +1,104 @@
+// Copyright (C) 2023 Justin Grant. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal-intl
+description: Islamic calendars (note there are 5 variants)
+features: [Temporal]
+---*/
+
+// Test data obtained from ICU
+
+const tests = [
+  {
+    calendar: "islamic",
+    choices: [
+      // Approximations of the observational Islamic calendar as computed by ICU4C.
+      {
+        inLeapYear: false,
+        daysInYear: 354,
+        daysInMonth12: 29,
+        isoDate: "2023-07-18",
+      },
+
+      // Approximations of the observational Islamic calendar as computed by ICU4X.
+      {
+        inLeapYear: true,
+        daysInYear: 355,
+        daysInMonth12: 30,
+        isoDate: "2023-07-19",
+      }
+    ],
+  },
+  {
+    calendar: "islamic-umalqura",
+    inLeapYear: false,
+    daysInYear: 354,
+    daysInMonth12: 30,
+    isoDate: "2023-07-19",
+  },
+  {
+    calendar: "islamic-civil",
+    inLeapYear: true,
+    daysInYear: 355,
+    daysInMonth12: 30,
+    isoDate: "2023-07-19",
+  },
+  {
+    calendar: "islamic-rgsa",
+    choices: [
+      // Approximations of the observational Islamic calendar as computed by ICU4C.
+      {
+        inLeapYear: false,
+        daysInYear: 354,
+        daysInMonth12: 29,
+        isoDate: "2023-07-18",
+      },
+
+      // Approximations of the observational Islamic calendar as computed by ICU4X.
+      {
+        inLeapYear: true,
+        daysInYear: 355,
+        daysInMonth12: 30,
+        isoDate: "2023-07-19",
+      }
+    ],
+  },
+  {
+    calendar: "islamic-tbla",
+    inLeapYear: true,
+    daysInYear: 355,
+    daysInMonth12: 30,
+    isoDate: "2023-07-18",
+  }
+];
+
+for (const test of tests) {
+  const { calendar, choices = [test] } = test;
+  const year = 1445;
+  const date = Temporal.PlainDate.from({ year, month: 1, day: 1, calendar });
+  assert.sameValue(date.calendarId, calendar);
+  assert.sameValue(date.year, year);
+  assert.sameValue(date.month, 1);
+  assert.sameValue(date.monthCode, "M01");
+  assert.sameValue(date.day, 1);
+
+  // Match the possible choice by comparing the ISO date value.
+  const choice = choices.find(({ isoDate }) => {
+    return date.toString().startsWith(isoDate);
+  });
+  assert(choice !== undefined, `No applicable choice found for calendar: ${calendar}`);
+
+  const { inLeapYear, daysInYear, daysInMonth12, isoDate } = choice;
+
+  assert.sameValue(date.inLeapYear, inLeapYear);
+  assert.sameValue(date.daysInYear, daysInYear);
+  assert.sameValue(date.monthsInYear, 12);
+  assert.sameValue(date.dayOfYear, 1);
+  const startOfNextYear = date.with({ year: year + 1 });
+  const lastDayOfThisYear = startOfNextYear.subtract({ days: 1 });
+  assert.sameValue(lastDayOfThisYear.dayOfYear, daysInYear);
+  const dateMonth12 = date.with({ month: 12 });
+  assert.sameValue(dateMonth12.daysInMonth, daysInMonth12);
+  assert.sameValue(date.toString(), `${isoDate}[u-ca=${calendar}]`, "ISO reference date");
+}
diff --git a/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-umalqura.js b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-umalqura.js
new file mode 100644
index 0000000000..b09dc3f1b4
--- /dev/null
+++ b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic-umalqura.js
@@ -0,0 +1,104 @@
+// Copyright (C) 2023 Justin Grant. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal-intl
+description: Islamic calendars (note there are 5 variants)
+features: [Temporal]
+---*/
+
+// Test data obtained from ICU
+
+const tests = [
+  {
+    calendar: "islamic",
+    choices: [
+      // Approximations of the observational Islamic calendar as computed by ICU4C.
+      {
+        inLeapYear: false,
+        daysInYear: 354,
+        daysInMonth12: 29,
+        isoDate: "2023-07-18",
+      },
+
+      // Approximations of the observational Islamic calendar as computed by ICU4X.
+      {
+        inLeapYear: true,
+        daysInYear: 355,
+        daysInMonth12: 30,
+        isoDate: "2023-07-19",
+      }
+    ],
+  },
+  {
+    calendar: "islamic-umalqura",
+    inLeapYear: false,
+    daysInYear: 354,
+    daysInMonth12: 30,
+    isoDate: "2023-07-19",
+  },
+  {
+    calendar: "islamic-civil",
+    inLeapYear: true,
+    daysInYear: 355,
+    daysInMonth12: 30,
+    isoDate: "2023-07-19",
+  },
+  {
+    calendar: "islamic-rgsa",
+    choices: [
+      // Approximations of the observational Islamic calendar as computed by ICU4C.
+      {
+        inLeapYear: false,
+        daysInYear: 354,
+        daysInMonth12: 29,
+        isoDate: "2023-07-18",
+      },
+
+      // Approximations of the observational Islamic calendar as computed by ICU4X.
+      {
+        inLeapYear: true,
+        daysInYear: 355,
+        daysInMonth12: 30,
+        isoDate: "2023-07-19",
+      }
+    ],
+  },
+  {
+    calendar: "islamic-tbla",
+    inLeapYear: true,
+    daysInYear: 355,
+    daysInMonth12: 30,
+    isoDate: "2023-07-18",
+  }
+];
+
+for (const test of tests) {
+  const { calendar, choices = [test] } = test;
+  const year = 1445;
+  const date = Temporal.PlainDate.from({ year, month: 1, day: 1, calendar });
+  assert.sameValue(date.calendarId, calendar);
+  assert.sameValue(date.year, year);
+  assert.sameValue(date.month, 1);
+  assert.sameValue(date.monthCode, "M01");
+  assert.sameValue(date.day, 1);
+
+  // Match the possible choice by comparing the ISO date value.
+  const choice = choices.find(({ isoDate }) => {
+    return date.toString().startsWith(isoDate);
+  });
+  assert(choice !== undefined, `No applicable choice found for calendar: ${calendar}`);
+
+  const { inLeapYear, daysInYear, daysInMonth12, isoDate } = choice;
+
+  assert.sameValue(date.inLeapYear, inLeapYear);
+  assert.sameValue(date.daysInYear, daysInYear);
+  assert.sameValue(date.monthsInYear, 12);
+  assert.sameValue(date.dayOfYear, 1);
+  const startOfNextYear = date.with({ year: year + 1 });
+  const lastDayOfThisYear = startOfNextYear.subtract({ days: 1 });
+  assert.sameValue(lastDayOfThisYear.dayOfYear, daysInYear);
+  const dateMonth12 = date.with({ month: 12 });
+  assert.sameValue(dateMonth12.daysInMonth, daysInMonth12);
+  assert.sameValue(date.toString(), `${isoDate}[u-ca=${calendar}]`, "ISO reference date");
+}
diff --git a/test/staging/Intl402/Temporal/old/islamic-calendars-islamic.js b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic.js
new file mode 100644
index 0000000000..b09dc3f1b4
--- /dev/null
+++ b/test/staging/Intl402/Temporal/old/islamic-calendars-islamic.js
@@ -0,0 +1,104 @@
+// Copyright (C) 2023 Justin Grant. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal-intl
+description: Islamic calendars (note there are 5 variants)
+features: [Temporal]
+---*/
+
+// Test data obtained from ICU
+
+const tests = [
+  {
+    calendar: "islamic",
+    choices: [
+      // Approximations of the observational Islamic calendar as computed by ICU4C.
+      {
+        inLeapYear: false,
+        daysInYear: 354,
+        daysInMonth12: 29,
+        isoDate: "2023-07-18",
+      },
+
+      // Approximations of the observational Islamic calendar as computed by ICU4X.
+      {
+        inLeapYear: true,
+        daysInYear: 355,
+        daysInMonth12: 30,
+        isoDate: "2023-07-19",
+      }
+    ],
+  },
+  {
+    calendar: "islamic-umalqura",
+    inLeapYear: false,
+    daysInYear: 354,
+    daysInMonth12: 30,
+    isoDate: "2023-07-19",
+  },
+  {
+    calendar: "islamic-civil",
+    inLeapYear: true,
+    daysInYear: 355,
+    daysInMonth12: 30,
+    isoDate: "2023-07-19",
+  },
+  {
+    calendar: "islamic-rgsa",
+    choices: [
+      // Approximations of the observational Islamic calendar as computed by ICU4C.
+      {
+        inLeapYear: false,
+        daysInYear: 354,
+        daysInMonth12: 29,
+        isoDate: "2023-07-18",
+      },
+
+      // Approximations of the observational Islamic calendar as computed by ICU4X.
+      {
+        inLeapYear: true,
+        daysInYear: 355,
+        daysInMonth12: 30,
+        isoDate: "2023-07-19",
+      }
+    ],
+  },
+  {
+    calendar: "islamic-tbla",
+    inLeapYear: true,
+    daysInYear: 355,
+    daysInMonth12: 30,
+    isoDate: "2023-07-18",
+  }
+];
+
+for (const test of tests) {
+  const { calendar, choices = [test] } = test;
+  const year = 1445;
+  const date = Temporal.PlainDate.from({ year, month: 1, day: 1, calendar });
+  assert.sameValue(date.calendarId, calendar);
+  assert.sameValue(date.year, year);
+  assert.sameValue(date.month, 1);
+  assert.sameValue(date.monthCode, "M01");
+  assert.sameValue(date.day, 1);
+
+  // Match the possible choice by comparing the ISO date value.
+  const choice = choices.find(({ isoDate }) => {
+    return date.toString().startsWith(isoDate);
+  });
+  assert(choice !== undefined, `No applicable choice found for calendar: ${calendar}`);
+
+  const { inLeapYear, daysInYear, daysInMonth12, isoDate } = choice;
+
+  assert.sameValue(date.inLeapYear, inLeapYear);
+  assert.sameValue(date.daysInYear, daysInYear);
+  assert.sameValue(date.monthsInYear, 12);
+  assert.sameValue(date.dayOfYear, 1);
+  const startOfNextYear = date.with({ year: year + 1 });
+  const lastDayOfThisYear = startOfNextYear.subtract({ days: 1 });
+  assert.sameValue(lastDayOfThisYear.dayOfYear, daysInYear);
+  const dateMonth12 = date.with({ month: 12 });
+  assert.sameValue(dateMonth12.daysInMonth, daysInMonth12);
+  assert.sameValue(date.toString(), `${isoDate}[u-ca=${calendar}]`, "ISO reference date");
+}