diff --git a/test/cjs/import/exports.js b/test/cjs/import/exports.js
index d5634be72..56d1e11df 100644
--- a/test/cjs/import/exports.js
+++ b/test/cjs/import/exports.js
@@ -15,6 +15,7 @@ import * as nsFunction from "../../fixture/cjs/export/function.js"
 import * as nsGetSet from "../../fixture/cjs/export/get-set.js"
 import * as nsPseudo from "../../fixture/cjs/export/pseudo.js"
 import * as nsPseudoEmpty from "../../fixture/cjs/export/pseudo-empty.js"
+import * as nsStarMixed from "../../fixture/cjs/export/star-mixed"
 
 export default () => {
   let ns = createNamespace({ 0: "a", default: defaultArray })
@@ -58,11 +59,13 @@ export default () => {
   ns = createNamespace({})
   assert.deepStrictEqual(nsPseudoEmpty, ns)
 
+  ns = createNamespace({ a: "a", b: "b", c: "c", d: "d", e: "e" })
+  assert.deepStrictEqual(nsStarMixed, ns)
+
   assert.strictEqual(nsGetSet.safe, "safe get")
   assert.strictEqual(Reflect.getPrototypeOf(defaultEmpty), Object.prototype)
 
   assert.deepStrictEqual(defaultObject, { a: "a" })
   assert.strictEqual(aOfObject, "a")
-
-  assert.deepStrictEqual(defaultReExport, { a: "re-export-nested" })
+  assert.deepStrictEqual(defaultReExport, {})
 }
diff --git a/test/cycle/namespace/immutable/re-export/c.mjs b/test/cycle/namespace/immutable/re-export/c.mjs
index 7f7583ebe..ea293a86b 100644
--- a/test/cycle/namespace/immutable/re-export/c.mjs
+++ b/test/cycle/namespace/immutable/re-export/c.mjs
@@ -1,3 +1,3 @@
-export * from "./d.js"
+export { default as d } from "./d.js"
 export * from "./e.mjs"
-export * from "./f.js"
+export { default as f } from "./f.js"
diff --git a/test/export/star.mjs b/test/export/star.mjs
index b1964c5ef..97beaeab1 100644
--- a/test/export/star.mjs
+++ b/test/export/star.mjs
@@ -1,7 +1,7 @@
 import assert from "assert"
 import createNamespace from "../create-namespace.js"
 import def, { a, b } from "../fixture/export/star-with-default.mjs"
-import { c, d } from "../fixture/export/star-from/a.mjs"
+import { c, d } from "../fixture/export/star-from-default/a.mjs"
 import * as ns from "../fixture/export/star-without-default.mjs"
 
 export default () => {
diff --git a/test/fixture/cjs/export/re-exort-nested/index.js b/test/fixture/cjs/export/re-exort-nested/index.js
deleted file mode 100644
index 26d31edc0..000000000
--- a/test/fixture/cjs/export/re-exort-nested/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-"use strict"
-
-module.exports = { a: "re-export-nested" }
diff --git a/test/fixture/cjs/export/re-export-nested/index.js b/test/fixture/cjs/export/re-export-nested/index.js
new file mode 100644
index 000000000..10b61bf19
--- /dev/null
+++ b/test/fixture/cjs/export/re-export-nested/index.js
@@ -0,0 +1,3 @@
+"use strict"
+
+// Export nothing.
diff --git a/test/fixture/cjs/export/re-export.js b/test/fixture/cjs/export/re-export.js
index 63b9f3d14..d18f42453 100644
--- a/test/fixture/cjs/export/re-export.js
+++ b/test/fixture/cjs/export/re-export.js
@@ -1,5 +1,5 @@
 "use strict"
 
-module.exports = require("./re-exort-nested")
+module.exports = require("./re-export-nested")
 
 require("./empty.js")
diff --git a/test/fixture/cjs/export/star-mixed/a.js b/test/fixture/cjs/export/star-mixed/a.js
new file mode 100644
index 000000000..4363db86e
--- /dev/null
+++ b/test/fixture/cjs/export/star-mixed/a.js
@@ -0,0 +1 @@
+export const a = "a"
diff --git a/test/fixture/cjs/export/star-mixed/c.js b/test/fixture/cjs/export/star-mixed/c.js
new file mode 100644
index 000000000..737655b6d
--- /dev/null
+++ b/test/fixture/cjs/export/star-mixed/c.js
@@ -0,0 +1,3 @@
+"use strict"
+
+exports.c = "c"
diff --git a/test/fixture/cjs/export/star-mixed/e.js b/test/fixture/cjs/export/star-mixed/e.js
new file mode 100644
index 000000000..ec19d1ab8
--- /dev/null
+++ b/test/fixture/cjs/export/star-mixed/e.js
@@ -0,0 +1 @@
+export const e = "e"
diff --git a/test/fixture/cjs/export/star-mixed/index.js b/test/fixture/cjs/export/star-mixed/index.js
new file mode 100644
index 000000000..a254e2805
--- /dev/null
+++ b/test/fixture/cjs/export/star-mixed/index.js
@@ -0,0 +1,5 @@
+export * from "./a.js"
+export const b = "b"
+export * from "./c.js"
+export const d = "d"
+export * from "./e.js"
diff --git a/test/fixture/export/star-from/a.mjs b/test/fixture/export/star-from-default/a.mjs
similarity index 100%
rename from test/fixture/export/star-from/a.mjs
rename to test/fixture/export/star-from-default/a.mjs
diff --git a/test/fixture/export/star-from/b.mjs b/test/fixture/export/star-from-default/b.mjs
similarity index 100%
rename from test/fixture/export/star-from/b.mjs
rename to test/fixture/export/star-from-default/b.mjs
diff --git a/test/fixture/export/star-from/c.mjs b/test/fixture/export/star-from-default/c.mjs
similarity index 100%
rename from test/fixture/export/star-from/c.mjs
rename to test/fixture/export/star-from-default/c.mjs
diff --git a/test/fixture/export/star-from/d.mjs b/test/fixture/export/star-from-default/d.mjs
similarity index 100%
rename from test/fixture/export/star-from/d.mjs
rename to test/fixture/export/star-from-default/d.mjs