diff --git a/bower.json b/bower.json
index 4db98912..1c252890 100644
--- a/bower.json
+++ b/bower.json
@@ -47,5 +47,8 @@
     "angular": "~1.3.0-beta.18",
     "angular-sanitize": "~1.3.0-beta.18",
     "bootstrap": "~3.2.0"
+  },
+  "devDependencies": {
+    "angular-mocks": "~1.2.22"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
index f3687437..989387e2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -10,7 +10,11 @@ var gettext = require('gulp-angular-gettext')
 var jade = require('gulp-jade')
 var clean = require('gulp-clean')
 var protractor = require("gulp-protractor")
+var protractorConfig = require('./res/test/protractor.conf.js')
+var karma = require('karma').server
+var karmaConfig = require('./res/test/karma.conf.js')
 var stream = require('stream')
+var _ = require('lodash')
 
 
 gulp.task('jshint', function () {
@@ -41,13 +45,21 @@ gulp.task('lint', ['jshint', 'jsonlint'])
 gulp.task('test', ['lint', 'protractor'])
 gulp.task('build', ['translate', 'webpack:build'])
 
+gulp.task('karma', function (done) {
+  karma.start(_.assign({}, karmaConfig, {singleRun: true}), done)
+})
+
+gulp.task('karma_watch', function (done) {
+  karma.start(karmaConfig, done)
+})
+
 gulp.task('webdriver_update', protractor.webdriver_update)
 gulp.task('webdriver_standalone', protractor.webdriver_standalone)
 
 gulp.task('protractor', ['webdriver_update'], function (callback) {
   gulp.src(["./res/test/**/*.js"])
     .pipe(protractor.protractor({
-      configFile: './res/test/protractor.conf.js'
+      configFile: protractorConfig
     }))
     .on('error', function (e) {
       console.log(e)
diff --git a/res/app/hello-test.js b/res/app/hello-test.js
new file mode 100644
index 00000000..0c7c43a6
--- /dev/null
+++ b/res/app/hello-test.js
@@ -0,0 +1,10 @@
+describe('greeter', function () {
+
+  function greet(str) {
+    return 'Helloaw, ' + str
+  }
+
+  it('should say Hello to the World', function () {
+    expect(greet('World')).toEqual('Hello, World!')
+  })
+})