diff --git a/editions/test/tiddlers/DefaultTiddlers.tid b/editions/test/tiddlers/DefaultTiddlers.tid
new file mode 100644
index 000000000..cc98f9dd6
--- /dev/null
+++ b/editions/test/tiddlers/DefaultTiddlers.tid
@@ -0,0 +1,3 @@
+title: $:/DefaultTiddlers
+
+HelloThere
diff --git a/editions/test/tiddlers/HelloThere.tid b/editions/test/tiddlers/HelloThere.tid
new file mode 100644
index 000000000..aa11bb09f
--- /dev/null
+++ b/editions/test/tiddlers/HelloThere.tid
@@ -0,0 +1,5 @@
+title: HelloThere
+
+This is TiddlyWiki5's browser-based test runner. See the bottom of this page for the test results.
+
+http://five.tiddlywiki.com/
diff --git a/editions/test/tiddlers/tests/test.js b/editions/test/tiddlers/tests/test.js
new file mode 100644
index 000000000..8ef552e37
--- /dev/null
+++ b/editions/test/tiddlers/tests/test.js
@@ -0,0 +1,21 @@
+/*\
+title: test.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+An example test specification
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+describe("WikiParser tests", function() {
+  it("contains spec with an expectation", function() {
+    expect(true).toBe(true);
+  });
+});
+
+})();
diff --git a/editions/test/tiddlywiki.info b/editions/test/tiddlywiki.info
new file mode 100644
index 000000000..e54562c82
--- /dev/null
+++ b/editions/test/tiddlywiki.info
@@ -0,0 +1,5 @@
+{
+	"plugins": [
+		"tiddlywiki/jasmine"
+	]
+}
\ No newline at end of file
diff --git a/test.sh b/test.sh
new file mode 100755
index 000000000..82607e4b1
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# test TiddlyWiki5
+
+# create a temporary directory if it doesn't already exist
+
+mkdir -p tmp
+mkdir -p tmp/test
+
+# build test.html
+
+node ./tiddlywiki.js \
+	./editions/test \
+	--verbose \
+	--savetiddler $:/core/templates/tiddlywiki5.template.html tmp/test/index.html text/plain \
+	|| exit 1