diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json
index 3a71da1938..c5d93c2b12 100644
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -6,7 +6,7 @@
     "build.prod": "gulp build",
     "prestart": "npm install",
     "start": "concurrently \"npm run tsc:w\" \"npm run lite\" ",
-    "test": "live-server --open=test/tests-runner.html",
+    "test": "live-server --open=tests-runner.html",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
     "lite": "lite-server",
diff --git a/demo-shell-ng2/test/tests-runner.html b/demo-shell-ng2/test/tests-runner.html
deleted file mode 100644
index b89b05a737..0000000000
--- a/demo-shell-ng2/test/tests-runner.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8">
-    <title>Ng App Unit Tests</title>
-    <link rel="stylesheet" href="../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
-    <script src="../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
-    <script src="../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
-    <script src="../node_modules/jasmine-core/lib/jasmine-core/boot.js"></script>
-</head>
-<body>
-<!-- Unit Testing Chapter #1: Proof of life.  -->
-<script>
-    it('true is true', function(){ expect(true).toEqual(true); });
-</script>
-</body>
-</html>
diff --git a/demo-shell-ng2/tests-runner.html b/demo-shell-ng2/tests-runner.html
new file mode 100644
index 0000000000..c29333199a
--- /dev/null
+++ b/demo-shell-ng2/tests-runner.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="content-type" content="text/html;charset=utf-8">
+    <title>Alfresco Angular 2 Unit Tests</title>
+    <link rel="stylesheet" href="../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
+    <script src="../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
+    <script src="../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
+    <script src="../node_modules/jasmine-core/lib/jasmine-core/boot.js"></script>
+
+    <!-- #1. add the system.js library -->
+    <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+    <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+    <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+    <script src="node_modules/systemjs/dist/system.src.js"></script>
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
+    <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+
+    <script src="node_modules/angular2/bundles/http.dev.js"></script>
+    <script src="node_modules/angular2/bundles/router.dev.js"></script>
+    <script src="node_modules/angular2/bundles/testing.dev.js"></script>
+
+    <script>
+        // #2. Configure systemjs to use the .js extension
+        //     for imports from the app folder
+        System.config({
+            packages: {
+                'app': {defaultExtension: 'js'}
+            }
+        });
+
+        // #3. Import the spec file explicitly
+        System.import('app/services/authentication.spec')
+
+                // #4. wait for all imports to load ...
+                //     then re-execute `window.onload` which
+                //     triggers the Jasmine test-runner start
+                //     or explain what went wrong.
+                .then(window.onload)
+                .catch(console.error.bind(console));
+    </script>
+
+</head>
+<body>
+<!-- Unit Testing Chapter #1: Proof of life.  -->
+<script>
+
+</script>
+</body>
+</html>
\ No newline at end of file
