     'test:acceptance'
   ]
   grunt.registerTask 'test:unit', [
-    'mochaTest'
+    'mochaTest:unit'
+  ]
+  grunt.registerTask 'test:integration', [
+    'mochaTest:integration'
   ]
   grunt.registerTask 'test:acceptance', [
     'cucumberjs'


    # Unit testing using mocha
    mochaTest:
      test:
        src: ['specs/**/*.coffee']
        options:
          #reporter: 'progress'
          require: 'coffee-script/register'

    # Acceptance testing with cucumber

        files: [ 'src/**/*.pegjs' ]
        tasks: [ 'peg:build' ]
      # Run the unit tests when .js sources change
      unit:
        files: [ 'src/**/*.js',   'src/**/*.coffee',
                 'specs/unit/**/*', 'specs/unit/**/*' ]
        tasks: [ 'test:unit' ]
      # Run the integration tests when .js sources change
      integration:
        files: [ 'src/**/*.js',   'src/**/*.coffee',
                 'specs/integration/**/*', 'specs/integration/**/*' ]
        tasks: [ 'test:integration' ]

    #################################################################### Build

