diff --git a/docs/config/02-files.md b/docs/config/02-files.md
index aa9f93f1f..5b7ef1eaa 100644
--- a/docs/config/02-files.md
+++ b/docs/config/02-files.md
@@ -35,6 +35,8 @@ Each pattern is either a simple string or an object with four properties:
 * **Description.** Should the files be included in the browser using
     `<script>` tag? Use `false` if you want to load them manually, eg.
     using [Require.js](../plus/requirejs.html).
+    
+    If a file is covered by multiple patterns with different `include` properties, `false` takes precedence over `true`.
 
 ### `served`
 * **Type.** Boolean
diff --git a/lib/file-list.js b/lib/file-list.js
index 71f2b3639..6df059967 100644
--- a/lib/file-list.js
+++ b/lib/file-list.js
@@ -214,28 +214,37 @@ List.prototype._refresh = function () {
 Object.defineProperty(List.prototype, 'files', {
   get: function () {
     var self = this
+    var uniqueFlat = function (list) {
+      return _.uniq(_.flatten(list), 'path')
+    }
+
+    var expandPattern = function (p) {
+      return from(self.buckets.get(p.pattern) || []).sort(byPath)
+    }
 
     var served = this._patterns.filter(function (pattern) {
       return pattern.served
     })
-    .map(function (p) {
-      return from(self.buckets.get(p.pattern) || []).sort(byPath)
+    .map(expandPattern)
+
+    var excludedPatterns = this._patterns.filter(function (pattern) {
+      return !pattern.included
     })
 
     var included = this._patterns.filter(function (pattern) {
       return pattern.included
     })
-    .map(function (p) {
-      return from(self.buckets.get(p.pattern) || []).sort(byPath)
-    })
-
-    var uniqFlat = function (list) {
-      return _.uniq(_.flatten(list), 'path')
-    }
+    .map(expandPattern)
 
+    var flatIncluded = uniqueFlat(included)
+    flatIncluded = excludedPatterns.reduce(function (included, p) {
+      return included.filter(function (f) {
+        return !mm(f.path, p.pattern)
+      })
+    }, flatIncluded)
     return {
-      served: uniqFlat(served),
-      included: uniqFlat(included)
+      served: uniqueFlat(served),
+      included: flatIncluded
     }
   }
 })
diff --git a/test/e2e/files.feature b/test/e2e/files.feature
new file mode 100644
index 000000000..357e06862
--- /dev/null
+++ b/test/e2e/files.feature
@@ -0,0 +1,66 @@
+Feature: Including files
+  In order to use Karma
+  As a person who wants to write great tests
+  I want to be able to include and exclude files
+
+  Scenario: Execute a test excluding a file
+    Given a configuration with:
+      """
+      files = [
+        {pattern: 'files/log_foo.js', included: false},
+        'files/*.js'
+       ];
+      browsers = ['PhantomJS'];
+      plugins = [
+        'karma-jasmine',
+        'karma-phantomjs-launcher'
+      ];
+      """
+    When I start Karma
+    Then it passes with:
+      """
+      .
+      PhantomJS
+      """
+
+  Scenario: Execute a test excluding an explicitly included file
+    Given a configuration with:
+      """
+      files = [
+        {pattern: 'files/log_foo.js', included: false},
+        {pattern: 'files/log_foo.js', included: true},
+        'files/*.js'
+       ];
+      browsers = ['PhantomJS'];
+      plugins = [
+        'karma-jasmine',
+        'karma-phantomjs-launcher'
+      ];
+      """
+    When I start Karma
+    Then it passes with:
+      """
+      .
+      PhantomJS
+      """
+
+  Scenario: Execute a test excluding an explicitly included file in another order
+    Given a configuration with:
+      """
+      files = [
+        'files/*.js',
+        {pattern: 'files/log_foo.js', included: false},
+        {pattern: 'files/log_foo.js', included: true}
+       ];
+      browsers = ['PhantomJS'];
+      plugins = [
+        'karma-jasmine',
+        'karma-phantomjs-launcher'
+      ];
+      """
+    When I start Karma
+    Then it passes with:
+      """
+      .
+      PhantomJS
+      """
diff --git a/test/e2e/support/files/log_foo.js b/test/e2e/support/files/log_foo.js
new file mode 100644
index 000000000..a52b53978
--- /dev/null
+++ b/test/e2e/support/files/log_foo.js
@@ -0,0 +1,2 @@
+
+console.log('foo')
diff --git a/test/e2e/support/files/test.js b/test/e2e/support/files/test.js
new file mode 100644
index 000000000..c57860494
--- /dev/null
+++ b/test/e2e/support/files/test.js
@@ -0,0 +1,5 @@
+describe('plus', function () {
+  it('should pass', function () {
+    expect(true).toBe(true)
+  })
+})