diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e6937bc96..4ce7cbbbe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -500,11 +500,18 @@ jobs:
       - name: Build jco
         run: pnpm run build
 
+      - name: Build preview2-shim
+        run: pnpm --filter '@bytecodealliance/preview2-shim' --fail-if-no-match run build
+
+      - name: Build preview3-shim
+        if: ${{ matrix.workspace == 'preview3-shim' }}
+        run: pnpm --filter '@bytecodealliance/preview3-shim' --fail-if-no-match run build
+
       - name: Test Workspaces
         env:
           TEST_PUPPETEER_LAUNCH_ARGS: |
             --no-sandbox
-        run: pnpm --filter 'packages/${{ matrix.workspace }}' run test
+        run: pnpm --filter '@bytecodealliance/${{ matrix.workspace }}' --fail-if-no-match run test
 
   test-jco-node-fs:
     name: Test jco-node-fs (${{ matrix.os }})
diff --git a/packages/preview3-shim/.gitignore b/packages/preview3-shim/.gitignore
index d2fcdb5a1..e0c7dfc7a 100644
--- a/packages/preview3-shim/.gitignore
+++ b/packages/preview3-shim/.gitignore
@@ -1,2 +1,3 @@
 # TypeScript build outputs
 /dist/
+/*.tsbuildinfo
diff --git a/packages/preview3-shim/package.json b/packages/preview3-shim/package.json
index bd1a9d2dd..7e7e7154f 100644
--- a/packages/preview3-shim/package.json
+++ b/packages/preview3-shim/package.json
@@ -48,9 +48,9 @@
     }
   },
   "scripts": {
-    "build": "tsc --project tsconfig.build.json && node scripts/build-workers.mjs",
-    "build:watch": "tsc --watch",
-    "types:check": "tsc --noEmit",
+    "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.browser.json && node scripts/build-workers.mjs",
+    "build:watch": "tsc --build --watch tsconfig.build.json tsconfig.build.browser.json",
+    "types:check": "tsc --noEmit && tsc --project tsconfig.browser.json --noEmit",
     "fmt": "oxfmt",
     "fmt:check": "oxfmt --check",
     "lint": "oxlint",
diff --git a/packages/preview3-shim/tsconfig.browser.json b/packages/preview3-shim/tsconfig.browser.json
new file mode 100644
index 000000000..30ba98f5f
--- /dev/null
+++ b/packages/preview3-shim/tsconfig.browser.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "include": ["src/browser/**/*"],
+  "compilerOptions": {
+    "module": "ESNext",
+    "moduleResolution": "Bundler"
+  }
+}
diff --git a/packages/preview3-shim/tsconfig.build.browser.json b/packages/preview3-shim/tsconfig.build.browser.json
new file mode 100644
index 000000000..f5bf68898
--- /dev/null
+++ b/packages/preview3-shim/tsconfig.build.browser.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.browser.json",
+  "compilerOptions": {
+    "rootDir": "src/",
+    "declaration": true,
+    "declarationMap": false,
+    "sourceMap": false,
+    "noEmit": false
+  }
+}
diff --git a/packages/preview3-shim/tsconfig.json b/packages/preview3-shim/tsconfig.json
index 6caac5bee..aab91b2db 100644
--- a/packages/preview3-shim/tsconfig.json
+++ b/packages/preview3-shim/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "include": ["src/**/*"],
+  "include": ["src/nodejs/**/*"],
   "compilerOptions": {
     "outDir": "dist",
     "target": "ES2022",