diff --git a/gulp/config.js b/gulp/config.js
index c2f9f60..438c8ff 100644
--- a/gulp/config.js
+++ b/gulp/config.js
@@ -7,7 +7,9 @@ const config = {
 
   scripts: {
     src: './app/js/**/*.js',
-    dest: './build/js/'
+    dest: './build/js/',
+    test: './tests/**/*.js',
+    gulp: './gulp/**/*.js'
   },
 
   images: {
diff --git a/gulp/tasks/lint.js b/gulp/tasks/lint.js
index d50a83a..4ff64e7 100644
--- a/gulp/tasks/lint.js
+++ b/gulp/tasks/lint.js
@@ -6,9 +6,9 @@ import config from '../config';
 
 gulp.task('lint', function() {
 
-  return gulp.src([config.scripts.src, config.testFiles, './*.js'])
+  return gulp.src([config.scripts.src, config.scripts.test, config.scripts.gulp])
     .pipe(eslint())
     .pipe(eslint.format())
     .pipe(eslint.failAfterError());
 
-});
\ No newline at end of file
+});
diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js
index 8436ddd..22c28fe 100644
--- a/gulp/tasks/test.js
+++ b/gulp/tasks/test.js
@@ -22,7 +22,7 @@ gulp.task('test', () => {
     files = ['tests/helper.js', singleFile];
   } else {
     // Default to all test files
-    files = [config.testFiles];
+    files = [config.scripts.test];
   }
 
   // Ensure that all window/DOM related properties