diff --git a/Makefile b/Makefile
index 9c8d89b..6f9840a 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,8 @@ PARSER_OUT_FILE_NEW = $(LIB_DIR)/parser.js.new
 BROWSER_FILE_DEV = $(BROWSER_DIR)/peg-$(PEGJS_VERSION).js
 BROWSER_FILE_MIN = $(BROWSER_DIR)/peg-$(PEGJS_VERSION).min.js
 
+SPEC_SERVER_FILE = $(SPEC_DIR)/server
+
 VERSION_FILE = VERSION
 
 # ===== Executables =====
@@ -103,6 +105,7 @@ lint:
 	$(ESLINT)                                                                \
 	  `find $(LIB_DIR) -name '*.js'`                                         \
 	  `find $(SPEC_DIR) -name '*.js' -and -not -path '$(SPEC_DIR)/vendor/*'` \
+	  $(SPEC_SERVER_FILE)                                                    \
 	  $(BENCHMARK_DIR)/*.js                                                  \
 	  $(BENCHMARK_RUN)                                                       \
 	  $(PEGJS)
diff --git a/spec/.eslintrc.json b/spec/.eslintrc.json
index 52939e2..a3dc8e0 100644
--- a/spec/.eslintrc.json
+++ b/spec/.eslintrc.json
@@ -1,5 +1,6 @@
 {
   "env": {
+    "commonjs": true,
     "jasmine": true
   }
 }
diff --git a/spec/README.md b/spec/README.md
index fc1376a..71c8cd9 100644
--- a/spec/README.md
+++ b/spec/README.md
@@ -38,18 +38,12 @@ All commands in the following steps need to be executed in PEG.js root directory
      $ npm install
      ```
 
-  3. Build browser version of PEG.js:
+  3. Serve the spec suite using a web server:
 
      ```console
-     $ make browser
+     $ spec/server
      ```
 
-  4. Serve PEG.js root directory using a web server:
+  4. Point your browser to the [spec suite](http://localhost:8000/).
 
-     ```console
-     $ node_modules/.bin/http-server
-     ```
-
-  5. Point your browser to the [spec suite](http://localhost:8080/spec/index.html).
-
-  6. Watch the specs pass (or fail).
+  5. Watch the specs pass (or fail).
diff --git a/spec/api/generated-parser-api.spec.js b/spec/api/generated-parser-api.spec.js
index 3231d93..3ff1dcf 100644
--- a/spec/api/generated-parser-api.spec.js
+++ b/spec/api/generated-parser-api.spec.js
@@ -1,8 +1,10 @@
 /* eslint no-console: 0 */
-/* global peg, console */
+/* global console */
 
 "use strict";
 
+var peg = require("../../lib/peg");
+
 describe("generated parser API", function() {
   describe("parse", function() {
     it("parses input", function() {
diff --git a/spec/api/pegjs-api.spec.js b/spec/api/pegjs-api.spec.js
index 5448f12..9d02c66 100644
--- a/spec/api/pegjs-api.spec.js
+++ b/spec/api/pegjs-api.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../lib/peg");
+
 describe("PEG.js API", function() {
   describe("generate", function() {
     it("generates a parser", function() {
diff --git a/spec/api/plugin-api.spec.js b/spec/api/plugin-api.spec.js
index 73eb7f8..d89356f 100644
--- a/spec/api/plugin-api.spec.js
+++ b/spec/api/plugin-api.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../lib/peg");
+
 describe("plugin API", function() {
   beforeEach(function() {
     this.addMatchers({
diff --git a/spec/behavior/generated-parser-behavior.spec.js b/spec/behavior/generated-parser-behavior.spec.js
index 8a0107b..2824569 100644
--- a/spec/behavior/generated-parser-behavior.spec.js
+++ b/spec/behavior/generated-parser-behavior.spec.js
@@ -1,8 +1,10 @@
 /* eslint no-console: 0 */
-/* global peg, console */
+/* global console */
 
 "use strict";
 
+var peg = require("../../lib/peg");
+
 describe("generated parser behavior", function() {
   function varyOptimizationOptions(block) {
     function clone(object) {
diff --git a/spec/helpers.js b/spec/helpers.js
deleted file mode 100644
index 3e60a00..0000000
--- a/spec/helpers.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* global require */
-
-"use strict";
-
-(function(root) {
-  if (typeof module !== 'undefined') {
-    root.peg = require("../lib/peg.js");
-  }
-}(this));
diff --git a/spec/index.html b/spec/index.html
index 2ab1a45..a0734bd 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -6,21 +6,7 @@
     <link rel="stylesheet" href="vendor/jasmine/jasmine.css">
     <script src="vendor/jasmine/jasmine.js"></script>
     <script src="vendor/jasmine/jasmine-html.js"></script>
-    <script src="../browser/peg-0.10.0.js"></script>
-    <script src="helpers.js"></script>
-    <script src="unit/parser.spec.js"></script>
-    <script src="unit/compiler/passes/helpers.js"></script>
-    <script src="unit/compiler/passes/report-undefined-rules.spec.js"></script>
-    <script src="unit/compiler/passes/report-duplicate-rules.spec.js"></script>
-    <script src="unit/compiler/passes/report-duplicate-labels.spec.js"></script>
-    <script src="unit/compiler/passes/report-infinite-recursion.spec.js"></script>
-    <script src="unit/compiler/passes/report-infinite-repetition.spec.js"></script>
-    <script src="unit/compiler/passes/remove-proxy-rules.spec.js"></script>
-    <script src="unit/compiler/passes/generate-bytecode.spec.js"></script>
-    <script src="api/pegjs-api.spec.js"></script>
-    <script src="api/plugin-api.spec.js"></script>
-    <script src="api/generated-parser-api.spec.js"></script>
-    <script src="behavior/generated-parser-behavior.spec.js"></script>
+    <script src="bundle.js"></script>
     <script>
       (function() {
         var env      = jasmine.getEnv(),
diff --git a/spec/server b/spec/server
new file mode 100755
index 0000000..5076728
--- /dev/null
+++ b/spec/server
@@ -0,0 +1,37 @@
+#!/usr/bin/env node
+
+/* eslint-env node */
+/* eslint no-console: 0 */
+
+/*
+ * Small server whose main purpose is to ensure that both the specced code and
+ * the specs get passed through Babel & Browserify before they are served to the
+ * browser.
+ */
+
+var express    = require("express"),
+    logger     = require("morgan"),
+    glob       = require("glob"),
+    browserify = require("browserify"),
+    babelify   = require("babelify");
+
+var app = express();
+
+app.use(logger("dev"));
+app.use(express.static(__dirname));
+
+app.get("/bundle.js", function(req, res) {
+  var files = glob.sync(__dirname + "/**/*.js", {
+    ignore: __dirname + "/vendor/**/*"
+  });
+
+  browserify(files)
+    .transform(babelify, { presets: "es2015", compact: false })
+    .bundle()
+    .pipe(res);
+});
+
+app.listen(8000, function() {
+  console.log("Spec server running at http://localhost:8000...");
+});
+
diff --git a/spec/unit/compiler/passes/generate-bytecode.spec.js b/spec/unit/compiler/passes/generate-bytecode.spec.js
index 5bfc1ba..0071a7b 100644
--- a/spec/unit/compiler/passes/generate-bytecode.spec.js
+++ b/spec/unit/compiler/passes/generate-bytecode.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../../../lib/peg");
+
 describe("compiler pass |generateBytecode|", function() {
   var pass = peg.compiler.passes.generate.generateBytecode;
 
diff --git a/spec/unit/compiler/passes/helpers.js b/spec/unit/compiler/passes/helpers.js
index d6228ed..da0a4d2 100644
--- a/spec/unit/compiler/passes/helpers.js
+++ b/spec/unit/compiler/passes/helpers.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../../../lib/peg");
+
 beforeEach(function() {
   this.addMatchers({
     toChangeAST: function(grammar, details, options) {
diff --git a/spec/unit/compiler/passes/remove-proxy-rules.spec.js b/spec/unit/compiler/passes/remove-proxy-rules.spec.js
index 2db4a13..5ab6691 100644
--- a/spec/unit/compiler/passes/remove-proxy-rules.spec.js
+++ b/spec/unit/compiler/passes/remove-proxy-rules.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../../../lib/peg");
+
 describe("compiler pass |removeProxyRules|", function() {
   var pass = peg.compiler.passes.transform.removeProxyRules;
 
diff --git a/spec/unit/compiler/passes/report-duplicate-labels.spec.js b/spec/unit/compiler/passes/report-duplicate-labels.spec.js
index cad5a6d..11d5b2f 100644
--- a/spec/unit/compiler/passes/report-duplicate-labels.spec.js
+++ b/spec/unit/compiler/passes/report-duplicate-labels.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../../../lib/peg");
+
 describe("compiler pass |reportDuplicateLabels|", function() {
   var pass = peg.compiler.passes.check.reportDuplicateLabels;
 
diff --git a/spec/unit/compiler/passes/report-duplicate-rules.spec.js b/spec/unit/compiler/passes/report-duplicate-rules.spec.js
index 19641eb..cdc45c5 100644
--- a/spec/unit/compiler/passes/report-duplicate-rules.spec.js
+++ b/spec/unit/compiler/passes/report-duplicate-rules.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../../../lib/peg");
+
 describe("compiler pass |reportDuplicateRules|", function() {
   var pass = peg.compiler.passes.check.reportDuplicateRules;
 
diff --git a/spec/unit/compiler/passes/report-infinite-recursion.spec.js b/spec/unit/compiler/passes/report-infinite-recursion.spec.js
index f5612ac..906fd8b 100644
--- a/spec/unit/compiler/passes/report-infinite-recursion.spec.js
+++ b/spec/unit/compiler/passes/report-infinite-recursion.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../../../lib/peg");
+
 describe("compiler pass |reportInfiniteRecursion|", function() {
   var pass = peg.compiler.passes.check.reportInfiniteRecursion;
 
diff --git a/spec/unit/compiler/passes/report-infinite-repetition.spec.js b/spec/unit/compiler/passes/report-infinite-repetition.spec.js
index b0ceb5a..1671926 100644
--- a/spec/unit/compiler/passes/report-infinite-repetition.spec.js
+++ b/spec/unit/compiler/passes/report-infinite-repetition.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../../../lib/peg");
+
 describe("compiler pass |reportInfiniteRepetition|", function() {
   var pass = peg.compiler.passes.check.reportInfiniteRepetition;
 
diff --git a/spec/unit/compiler/passes/report-undefined-rules.spec.js b/spec/unit/compiler/passes/report-undefined-rules.spec.js
index bf9c5b5..ad73007 100644
--- a/spec/unit/compiler/passes/report-undefined-rules.spec.js
+++ b/spec/unit/compiler/passes/report-undefined-rules.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../../../lib/peg");
+
 describe("compiler pass |reportUndefinedRules|", function() {
   var pass = peg.compiler.passes.check.reportUndefinedRules;
 
diff --git a/spec/unit/parser.spec.js b/spec/unit/parser.spec.js
index 0ff259c..0ef46c8 100644
--- a/spec/unit/parser.spec.js
+++ b/spec/unit/parser.spec.js
@@ -1,7 +1,7 @@
-/* global peg */
-
 "use strict";
 
+var peg = require("../../lib/peg");
+
 describe("PEG.js grammar parser", function() {
   var literalAbcd       = { type: "literal",      value: "abcd", ignoreCase: false },
       literalEfgh       = { type: "literal",      value: "efgh", ignoreCase: false },