diff --git a/.gitignore b/.gitignore
index ea34c6950..5d06e0e6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 config.user.inc.php
+.DS_Store
+Thumbs.db
 /files/
 /build/
 /node_modules/
-.DS_Store
-Thumbs.db
+/vendor/
+tests/_output/*
diff --git a/Gruntfile.js b/Gruntfile.js
index d91b423d4..c2195afea 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -181,6 +181,8 @@ module.exports = function(grunt) {
 					'common/js/x.js',
 					'common/js/xe.js',
 					'common/js/modernizr.js',
+					'vendor/**',
+					'tests/**',
 				]
 			}
 		},
@@ -203,6 +205,8 @@ module.exports = function(grunt) {
 					'!common/css/bootstrap.css',
 					'!common/css/bootstrap-responsive.css',
 					'!**/*.min.css',
+					'!vendor/**',
+					'!tests/**',
 				]
 			}
 		},
@@ -218,7 +222,9 @@ module.exports = function(grunt) {
 					"!tests/**",
 					"!tools/**",
 					"!node_modules/**",
-					"!libs/**"
+					"!libs/**",
+					"!vendor/**",
+					"!tests/_output/**"
 				],
 			},
 		}