diff --git a/src/api/events.js b/src/api/events.js
index e4db1c8ee..47ed54dfe 100644
--- a/src/api/events.js
+++ b/src/api/events.js
@@ -78,7 +78,7 @@ exports.$off = function (event, fn) {
  */
 
 exports.$emit = function (event) {
-  this._cancelled = false
+  this._eventCancelled = false
   var cbs = this._events[event]
   if (cbs) {
     // avoid leaking arguments:
diff --git a/test/unit/specs/api/event_spec.js b/test/unit/specs/api/event_spec.js
new file mode 100644
index 000000000..855c1be50
--- /dev/null
+++ b/test/unit/specs/api/event_spec.js
@@ -0,0 +1,76 @@
+var Vue = require('../../../../src/vue')
+
+describe('Events API', function () {
+
+  var e, spy
+  beforeEach(function () {
+    e = new Vue()
+    spy = jasmine.createSpy('emitter')
+  })
+  
+  it('$on', function () {
+    e.$on('test', spy)
+    e.$emit('test', 1, 2 ,3, 4)
+    expect(spy.calls.count()).toBe(1)
+    expect(spy).toHaveBeenCalledWith(1, 2, 3, 4)
+  })
+
+  it('$once', function () {
+    e.$once('test', spy)
+    e.$emit('test', 1, 2 ,3)
+    e.$emit('test', 2, 3, 4)
+    expect(spy.calls.count()).toBe(1)
+    expect(spy).toHaveBeenCalledWith(1, 2, 3)
+  })
+
+  it('$off', function () {
+    e.$on('test1', spy)
+    e.$on('test2', spy)
+    e.$off()
+    e.$emit('test1')
+    e.$emit('test2')
+    expect(spy.calls.count()).toBe(0)
+  })
+
+  it('$off event', function () {
+    e.$on('test1', spy)
+    e.$on('test2', spy)
+    e.$off('test1')
+    e.$off('test1') // test off something that's already off
+    e.$emit('test1', 1)
+    e.$emit('test2', 2)
+    expect(spy.calls.count()).toBe(1)
+    expect(spy).toHaveBeenCalledWith(2)
+  })
+
+  it('$off event + fn', function () {
+    var spy2 = jasmine.createSpy('emitter')
+    e.$on('test', spy)
+    e.$on('test', spy2)
+    e.$off('test', spy)
+    e.$emit('test', 1, 2, 3)
+    expect(spy.calls.count()).toBe(0)
+    expect(spy2.calls.count()).toBe(1)
+    expect(spy2).toHaveBeenCalledWith(1, 2, 3)
+  })
+
+  it('$emit cancel', function () {
+    expect(e._eventCancelled).toBe(false)
+    e.$on('test', function () {
+      return false
+    })
+    e.$emit('test')
+    expect(e._eventCancelled).toBe(true)
+    e.$emit('other')
+    expect(e._eventCancelled).toBe(false)
+  })
+
+  it('$broadcast', function () {
+    // TODO
+  })
+
+  it('$dispatch', function () {
+    // TODO
+  })
+
+})
\ No newline at end of file
diff --git a/test/unit/specs/emitter_spec.js b/test/unit/specs/emitter_spec.js
deleted file mode 100644
index 3819f19af..000000000
--- a/test/unit/specs/emitter_spec.js
+++ /dev/null
@@ -1,76 +0,0 @@
-var Emitter = require('../../../src/emitter')
-
-describe('Emitter', function () {
-
-  var e, spy
-  beforeEach(function () {
-    e = new Emitter()
-    spy = jasmine.createSpy('emitter')
-  })
-  
-  it('on', function () {
-    e.on('test', spy)
-    e.emit('test', 1, 2 ,3, 4)
-    expect(spy.calls.count()).toBe(1)
-    expect(spy).toHaveBeenCalledWith(1, 2, 3, 4)
-  })
-
-  it('once', function () {
-    e.once('test', spy)
-    e.emit('test', 1, 2 ,3)
-    e.emit('test', 2, 3, 4)
-    expect(spy.calls.count()).toBe(1)
-    expect(spy).toHaveBeenCalledWith(1, 2, 3, undefined)
-  })
-
-  it('off', function () {
-    e.on('test1', spy)
-    e.on('test2', spy)
-    e.off()
-    e.emit('test1')
-    e.emit('test2')
-    expect(spy.calls.count()).toBe(0)
-  })
-
-  it('off event', function () {
-    e.on('test1', spy)
-    e.on('test2', spy)
-    e.off('test1')
-    e.off('test1') // test off something that's already off
-    e.emit('test1', 1)
-    e.emit('test2', 2)
-    expect(spy.calls.count()).toBe(1)
-    expect(spy).toHaveBeenCalledWith(2, undefined, undefined, undefined)
-  })
-
-  it('off event + fn', function () {
-    var spy2 = jasmine.createSpy('emitter')
-    e.on('test', spy)
-    e.on('test', spy2)
-    e.off('test', spy)
-    e.emit('test', 1, 2, 3)
-    expect(spy.calls.count()).toBe(0)
-    expect(spy2.calls.count()).toBe(1)
-    expect(spy2).toHaveBeenCalledWith(1, 2, 3, undefined)
-  })
-
-  it('apply emit', function () {
-    e.on('test', spy)
-    e.applyEmit('test', 1)
-    e.applyEmit('test', 1, 2, 3, 4, 5)
-    expect(spy).toHaveBeenCalledWith(1)
-    expect(spy).toHaveBeenCalledWith(1, 2, 3, 4, 5)
-  })
-
-  it('apply emit cancel', function () {
-    expect(e._cancelled).toBe(false)
-    e.on('test', function () {
-      return false
-    })
-    e.applyEmit('test')
-    expect(e._cancelled).toBe(true)
-    e.applyEmit('other')
-    expect(e._cancelled).toBe(false)
-  })
-
-})
\ No newline at end of file