diff --git a/.travis.yml b/.travis.yml
index 7742397..061af0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,3 +3,7 @@ node_js:
   - "0.12"
   - "0.10"
   - "4"
+script:
+  - npm test
+  - npm rm webpack && npm i webpack@beta || true
+  - npm test
diff --git a/appveyor.yml b/appveyor.yml
index 5bc2d72..47f137c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,4 +20,4 @@ install:
 test_script:
   - node --version
   - npm --version
-  - npm test
\ No newline at end of file
+  - npm test
diff --git a/spec/BasicSpec.js b/spec/BasicSpec.js
index a653f33..fc70fd0 100644
--- a/spec/BasicSpec.js
+++ b/spec/BasicSpec.js
@@ -20,6 +20,8 @@ var HtmlWebpackPlugin = require('../index.js');
 
 var OUTPUT_DIR = path.join(__dirname, '../dist');
 
+jasmine.getEnv().defaultTimeoutInterval = 5000;
+
 function testHtmlPlugin (webpackConfig, expectedResults, outputFile, done, expectErrors, expectWarnings) {
   outputFile = outputFile || 'index.html';
   webpack(webpackConfig, function (err, stats) {
@@ -106,7 +108,7 @@ describe('HtmlWebpackPlugin', function () {
     }, ['<script src="util_bundle.js"', '<script src="app_bundle.js"'], null, done);
   });
 
-  it('allows you to specify a custom loader', function (done) {
+  it('allows you to specify a custom loader without injection', function (done) {
     testHtmlPlugin({
       entry: {
         app: path.join(__dirname, 'fixtures/index.js')
@@ -117,7 +119,7 @@ describe('HtmlWebpackPlugin', function () {
       },
       plugins: [new HtmlWebpackPlugin({
         inject: false,
-        template: 'underscore-template-loader!' + path.join(__dirname, 'fixtures/test.html')
+        template: 'jade-loader!' + path.join(__dirname, 'fixtures/template.jade')
       })]
     },
     ['<script src="app_bundle.js', 'Some unique text'], null, done);
@@ -147,7 +149,7 @@ describe('HtmlWebpackPlugin', function () {
       },
       module: {
         loaders: [
-          {test: /\.html$/, loader: 'underscore-template-loader'}
+          {test: /\.jade$/, loader: 'jade-loader'}
         ]
       },
       output: {
@@ -156,7 +158,7 @@ describe('HtmlWebpackPlugin', function () {
       },
       plugins: [new HtmlWebpackPlugin({
         inject: false,
-        template: path.join(__dirname, 'fixtures/test.html')
+        template: path.join(__dirname, 'fixtures/template.jade')
       })]
     },
     ['<script src="app_bundle.js', 'Some unique text'], null, done);
@@ -871,7 +873,7 @@ describe('HtmlWebpackPlugin', function () {
       plugins: [
         new HtmlWebpackPlugin({
           inject: false,
-          template: 'underscore-template-loader!' + path.join(__dirname, 'fixtures/custom_file.html')
+          template: 'jade!' + path.join(__dirname, 'fixtures/template.jade')
         }),
         examplePlugin
       ]
@@ -1059,10 +1061,10 @@ describe('HtmlWebpackPlugin', function () {
           template: path.join(__dirname, 'fixtures/non-existing-template.html')
         })
       ]
-    }, ["Child compilation failed:\n  Entry module not found: Error: Cannot resolve 'file' or 'directory'"], null, done, true);
+    }, ['Child compilation failed:\n  Entry module not found:'], null, done, true);
   });
 
-  it('should sort the chunks', function (done) {
+  it('should sort the chunks in auto mode', function (done) {
     testHtmlPlugin({
       entry: {
         util: path.join(__dirname, 'fixtures/util.js'),
diff --git a/spec/fixtures/custom_file.html b/spec/fixtures/custom_file.html
deleted file mode 100644
index 00911ba..0000000
--- a/spec/fixtures/custom_file.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-    <title>Test</title>
-  </head>
-  <body>
-    <p>Some unique text</p>
-    <% for(var i = 0; i <htmlWebpackPlugin.files.js.length; i++) {
-      var filename = htmlWebpackPlugin.files.js[i];
-      if (filename.indexOf('funky-script') < 0) continue;%>
-      <script src="<%=filename%>"></script>
-    <% } %>
-    <script src="<%=htmlWebpackPlugin.files.chunks.app.entry%>"></script>
-  </body>
-</html>
diff --git a/spec/fixtures/template.jade b/spec/fixtures/template.jade
new file mode 100644
index 0000000..5f56e94
--- /dev/null
+++ b/spec/fixtures/template.jade
@@ -0,0 +1,9 @@
+doctype html
+html
+  head
+    meta(http-equiv="Content-type" content="text/html; charset=utf-8")
+    title Demo
+  body
+    p Some unique text
+    each jsFile in htmlWebpackPlugin.files.js
+      script(src!=jsFile)
