diff --git a/demo-shell-ng2/config/webpack.test.js b/demo-shell-ng2/config/webpack.test.js
index d1f6c28a87..f2fe2870e0 100644
--- a/demo-shell-ng2/config/webpack.test.js
+++ b/demo-shell-ng2/config/webpack.test.js
@@ -1,6 +1,5 @@
 var helpers = require('./helpers');
 var fs = require('fs');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var glob = require('glob');
 
 const rootPath = helpers.root('node_modules');
@@ -34,12 +33,21 @@ module.exports = {
   },
 
   module: {
+      preLoaders: [
+          {
+              test: /\.js$/,
+              include: [
+                  ...alfrescoLibs
+      ],
+      loader: 'source-map-loader'
+      }
+    ],
     loaders: [
-      {
-        test: /\.ts$/,
-        exclude: /node_modules/,
-        loaders: ['awesome-typescript-loader', 'angular2-template-loader']
-      },
+        {
+            test: /\.ts$/,
+            loaders: ['awesome-typescript-loader', 'angular2-template-loader', 'systemjs-loader'],
+            exclude: ['node_modules','public']
+        },
       {
         test: /\.js$/,
         include: [