diff --git a/packages/tutorial/package.json b/packages/tutorial/package.json
index d1da745cfe1..cceda93c6d6 100644
--- a/packages/tutorial/package.json
+++ b/packages/tutorial/package.json
@@ -30,13 +30,13 @@
     "clean": "rimraf dist",
     "build": "rollup -c",
     "lernabuild": "rollup -c",
-    "test": "BABEL_ENV=production ../../node_modules/.bin/_mocha tests/*.test.js --require @babel/register",
+    "test": "BABEL_ENV=production ../../node_modules/.bin/_mocha tests/*.test.mjs --require @babel/register",
     "pubtest": "npm publish --registry http://localhost:6662",
     "pubforce": "npm publish",
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -",
     "start": "rollup -c -w",
     "netlify": "echo \"Not configured yet\"",
-    "testci": "BABEL_ENV=production ./node_modules/.bin/_mocha tests/*.test.js --require @babel/register"
+    "testci": "BABEL_ENV=production ./node_modules/.bin/_mocha tests/*.test.mjs --require @babel/register"
   },
   "peerDependencies": {
     "@freesewing/core": "^2.19.5",
@@ -71,7 +71,6 @@
     "prop-types": "^15.7.2",
     "mocha": "^9.1.1",
     "chai": "^4.2.0",
-    "chai-string": "^1.5.0",
     "@babel/register": "^7.10.5"
   },
   "files": [
diff --git a/packages/tutorial/tests/shared.test.mjs b/packages/tutorial/tests/shared.test.mjs
new file mode 100644
index 00000000000..883dcf9788b
--- /dev/null
+++ b/packages/tutorial/tests/shared.test.mjs
@@ -0,0 +1,41 @@
+// This file is auto-generated.
+// Changes you make will be overwritten.
+import chai from 'chai'
+import models from '@freesewing/models'
+import patterns from '@freesewing/pattern-info'
+import Tutorial from '../dist/index.mjs'
+
+// Shared tests
+import { testPatternConfig } from '../../../tests/patterns/config.mjs'
+import { testPatternDrafting } from '../../../tests/patterns/drafting.mjs'
+import { testPatternSampling } from '../../../tests/patterns/sampling.mjs'
+
+const expect = chai.expect
+
+
+// Test config
+testPatternConfig(
+  'tutorial',
+  new Tutorial(),
+  expect,
+  models,
+  patterns
+)
+
+// Test drafting
+testPatternDrafting(
+  'tutorial',
+  Tutorial,
+  expect,
+  models,
+  patterns
+)
+
+// Test sampling
+testPatternSampling(
+  'tutorial',
+  Tutorial,
+  expect,
+  models,
+  patterns
+)