diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index c2af03cf45..fc2c654427 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -22,6 +22,7 @@ module.exports = (grunt) ->
 	grunt.loadNpmTasks "grunt-contrib-coffee"
 	grunt.loadNpmTasks "grunt-shell"
 
+	grunt.task.loadTasks "./tasks"
 
 	execute = {}
 	for service in SERVICES
@@ -112,7 +113,7 @@ module.exports = (grunt) ->
 	grunt.registerTask "check:make", "Check that make is installed", () ->
 		Helpers.checkMake @async()
 
-	grunt.registerTask 'migrate', "compile migrations and run them", ['coffee:migrate', 'shell:migrate']
+	grunt.registerTask 'migrate', "compile migrations and run them", ["coffee:migrate", 'shell:migrate']
 
 
 	Helpers =
@@ -242,5 +243,4 @@ module.exports = (grunt) ->
 			rclient.on 'error', errorHandler
 
 
-	require('load-grunt-config')(grunt)
 
diff --git a/grunt/CreateAndDestoryUsers.coffee b/tasks/CreateAndDestoryUsers.coffee
similarity index 100%
rename from grunt/CreateAndDestoryUsers.coffee
rename to tasks/CreateAndDestoryUsers.coffee
diff --git a/grunt/ProjectSize.coffee b/tasks/ProjectSize.coffee
similarity index 100%
rename from grunt/ProjectSize.coffee
rename to tasks/ProjectSize.coffee