diff --git a/package.json b/package.json
index 6520e3d..67ff189 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,15 @@
     "should": "~1.2.2",
     "grunt-coffee-redux": "~0.2.3",
     "grunt-contrib-coffee": "~0.7.0",
-    "grunt-contrib-clean": "~0.4.1",
+    "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-watch": "~0.4.4",
     "grunt-contrib-jshint": "~0.6.0",
-    "grunt-coffeelint": "0.0.6",
+    "grunt-coffeelint": "0.0.7",
     "coffee-script": "~1.6.3",
-    "karma": "~0.8.5",
-    "grunt-karma": "~0.4.4"
+    "karma": "~0.9.4",
+    "grunt-karma": "~0.5.0",
+    "karma-ng-scenario": "0.0.2",
+    "karma-coffee-preprocessor": "0.0.2",
+    "karma-mocha": "0.0.3"
   }
 }
diff --git a/test/config-e2e.coffee b/test/config-e2e.coffee
index 80cac62..822565e 100644
--- a/test/config-e2e.coffee
+++ b/test/config-e2e.coffee
@@ -1,52 +1,52 @@
-basePath = '..'
-
-toServe = [
-  'components/bootstrap-css/css/bootstrap.css'
-  'components/jquery/jquery.js'
-  'components/angular-unstable/angular.js'
-  'components/angular-bootstrap/ui-bootstrap.js'
-  'components/angular-bootstrap/ui-bootstrap-tpls.js'
-  'angular-contenteditable.js'
-  'test/fixtures/simple.html'
-  'test/fixtures/typeahead1.html'
-  'test/fixtures/typeahead2.html'
-  'test/fixtures/typeahead3.html'
-  'test/fixtures/states.json'
-  'test/fixtures/img/ru.gif'
-  'test/fixtures/img/gb.gif'
-  'test/fixtures/img/us.gif'
-]
-
-toServe =
-  for file in toServe
+module.exports = (config) ->
+  toServe = for file in [
+    'components/bootstrap-css/css/bootstrap.css'
+    'components/jquery/jquery.js'
+    'components/angular-unstable/angular.js'
+    'components/angular-bootstrap/ui-bootstrap.js'
+    'components/angular-bootstrap/ui-bootstrap-tpls.js'
+    'angular-contenteditable.js'
+    'test/fixtures/simple.html'
+    'test/fixtures/typeahead1.html'
+    'test/fixtures/typeahead2.html'
+    'test/fixtures/typeahead3.html'
+    'test/fixtures/states.json'
+    'test/fixtures/img/ru.gif'
+    'test/fixtures/img/gb.gif'
+    'test/fixtures/img/us.gif'
+  ]
     pattern: file
     watched: false
     included: false
     served: true
 
-files = [
-  ANGULAR_SCENARIO
-  ANGULAR_SCENARIO_ADAPTER
-  'src/**/*.coffee'
-  'test/e2e/**/*.coffee'
-].concat toServe
+  config.set
+    basePath: '..'
 
-exclude = []
+    frameworks: ['ng-scenario']
 
-reporters = ['progress']
+    preprocessors: '**/*.coffee': 'coffee'
 
-port = 9876
+    files: [
+      'test/e2e/**/*.coffee'
+    ].concat toServe
 
-runnerPort = 9100
+    exclude: []
 
-colors = true
+    reporters: ['progress']
 
-logLevel = LOG_INFO
+    port: 9876
 
-autoWatch = true
+    runnerPort: 9100
 
-browsers = ['Chrome']
+    colors: true
 
-captureTimeout = 60000
+    logLevel: config.LOG_INFO
 
-singleRun = false
+    autoWatch: true
+
+    browsers: ['Chrome']
+
+    captureTimeout: 60000
+
+    singleRun: false
diff --git a/test/config-unit.coffee b/test/config-unit.coffee
index 430f1a9..e1514ec 100644
--- a/test/config-unit.coffee
+++ b/test/config-unit.coffee
@@ -1,30 +1,33 @@
-basePath = '..'
+module.exports = (config) ->
+  config.set
+    basePath: '..'
+    frameworks: ['mocha']
+    files: [
+      'components/expect/expect.js'
+      'components/angular/angular.js'
+      'src/**/*.coffee'
+      'test/unit/*.coffee'
+    ]
 
-files =
-[ MOCHA
-, MOCHA_ADAPTER
-, 'components/expect/expect.js'
-, 'components/angular/angular.js'
-, 'src/**/*.coffee'
-, 'test/unit/*.coffee'
-]
 
-exclude = []
+    preprocessors: '**/*.coffee': 'coffee'
 
-reporters = ['progress']
+    exclude: []
 
-port = 9876
+    reporters: ['progress']
 
-runnerPort = 9100
+    port: 9876
 
-colors = true
+    runnerPort: 9100
 
-logLevel = LOG_INFO
+    colors: true
 
-autoWatch = true
+    logLevel: LOG_INFO
 
-browsers = ['Chrome']
+    autoWatch: true
 
-captureTimeout = 60000
+    browsers: ['Chrome']
 
-singleRun = false
+    captureTimeout: 60000
+
+    singleRun: false
diff --git a/test/e2e/scenarios.coffee b/test/e2e/scenarios.coffee
index b35ee70..d2c29e9 100644
--- a/test/e2e/scenarios.coffee
+++ b/test/e2e/scenarios.coffee
@@ -47,8 +47,8 @@ angular.scenario.dsl 'scope', ->
       else
         done "don't understand argument #{arg}"
 
-describe 'radians', ->
-  describe 'contenteditable', ->
+describe 'module contenteditable', ->
+  describe 'directive contenteditable', ->
     describe 'simple application', ->
       beforeEach ->
         browser().navigateTo 'base/test/fixtures/simple.html'