diff --git a/tests/Api/ComponentTest.php b/tests/Api/ComponentTest.php
index 788ff942b..a67e60369 100644
--- a/tests/Api/ComponentTest.php
+++ b/tests/Api/ComponentTest.php
@@ -11,6 +11,9 @@
 
 namespace CachetHQ\Tests\Cachet\Api;
 
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasCreatedEvent;
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent;
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent;
 use CachetHQ\Cachet\Models\Component;
 
 /**
@@ -42,6 +45,8 @@ class ComponentTest extends AbstractApiTestCase
 
     public function test_cannot_create_component_without_authorization()
     {
+        $this->doesntExpectEvents(ComponentWasCreatedEvent::class);
+
         $response = $this->json('POST', '/api/v1/components');
 
         $response->assertStatus(401);
@@ -51,6 +56,8 @@ class ComponentTest extends AbstractApiTestCase
     {
         $this->beUser();
 
+        $this->doesntExpectEvents(ComponentWasCreatedEvent::class);
+
         $response = $this->json('POST', '/api/v1/components');
 
         $response->assertStatus(400);
@@ -60,6 +67,8 @@ class ComponentTest extends AbstractApiTestCase
     {
         $this->beUser();
 
+        $this->expectsEvents(ComponentWasCreatedEvent::class);
+
         $response = $this->json('POST', '/api/v1/components', [
             'name'        => 'Foo',
             'description' => 'Bar',
@@ -78,6 +87,8 @@ class ComponentTest extends AbstractApiTestCase
     {
         $this->beUser();
 
+        $this->expectsEvents(ComponentWasCreatedEvent::class);
+
         $response = $this->json('POST', '/api/v1/components', [
             'name'        => 'Foo',
             'description' => 'Bar',
@@ -95,6 +106,8 @@ class ComponentTest extends AbstractApiTestCase
     {
         $this->beUser();
 
+        $this->expectsEvents(ComponentWasCreatedEvent::class);
+
         $response = $this->json('POST', '/api/v1/components', [
             'name'        => 'Foo',
             'description' => 'Bar',
@@ -122,6 +135,8 @@ class ComponentTest extends AbstractApiTestCase
     {
         $this->beUser();
 
+        $this->expectsEvents(ComponentWasCreatedEvent::class);
+
         $response = $this->json('POST', '/api/v1/components', [
             'name'        => 'Foo',
             'description' => 'Bar',
@@ -151,6 +166,8 @@ class ComponentTest extends AbstractApiTestCase
         $this->beUser();
         $component = factory(Component::class)->create();
 
+        $this->expectsEvents(ComponentWasUpdatedEvent::class);
+
         $response = $this->json('PUT', '/api/v1/components/1', [
             'name' => 'Foo',
         ]);
@@ -168,6 +185,8 @@ class ComponentTest extends AbstractApiTestCase
             ],
         ]);
 
+        $this->expectsEvents(ComponentWasUpdatedEvent::class);
+
         $response = $this->json('PUT', '/api/v1/components/1', [
             'meta' => [
                 'uuid' => '172ff3fb-41f7-49d3-8bcd-f57b53627fa0',
@@ -189,7 +208,9 @@ class ComponentTest extends AbstractApiTestCase
         $this->beUser();
         $component = factory(Component::class)->create();
 
-        $response = $this->delete('/api/v1/components/1');
+        $this->expectsEvents(ComponentWasRemovedEvent::class);
+
+        $response = $this->json('DELETE', '/api/v1/components/1');
         $response->assertStatus(204);
     }
 }