diff --git a/CHANGELOG.md b/CHANGELOG.md
index f409363..5b8fc77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Add client service autowiring
 
 ## [2.1.0]
 ### Added
diff --git a/src/Resources/config/client.xml b/src/Resources/config/client.xml
index 6ca2e7e..f4b62f0 100644
--- a/src/Resources/config/client.xml
+++ b/src/Resources/config/client.xml
@@ -5,10 +5,12 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="nexy_slack.client" class="Nexy\Slack\Client" public="true">
+        <service id="Nexy\Slack\Client" public="true">
             <argument>%nexy_slack.endpoint%</argument>
             <argument>%nexy_slack.config%</argument>
             <argument type="service" id="nexy_slack.http.client" />
         </service>
+
+        <service id="nexy_slack.client" alias="Nexy\Slack\Client"/>
     </services>
 </container>
diff --git a/tests/DependencyInjection/NexySlackExtensionTest.php b/tests/DependencyInjection/NexySlackExtensionTest.php
index 2310095..12460a4 100644
--- a/tests/DependencyInjection/NexySlackExtensionTest.php
+++ b/tests/DependencyInjection/NexySlackExtensionTest.php
@@ -47,12 +47,13 @@ public function testLoadWithMinimalConfiguration(): void
         $this->assertContainerBuilderHasParameter('nexy_slack.endpoint', $endpoint);
         $this->assertContainerBuilderHasParameter('nexy_slack.config', $slackConfig);
 
-        $this->assertContainerBuilderHasService('nexy_slack.client', Client::class);
+        $this->assertContainerBuilderHasService(Client::class);
 
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument('nexy_slack.client', 0, '%nexy_slack.endpoint%');
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument('nexy_slack.client', 1, '%nexy_slack.config%');
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument('nexy_slack.client', 2, new Reference('nexy_slack.http.client'));
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument(Client::class, 0, '%nexy_slack.endpoint%');
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument(Client::class, 1, '%nexy_slack.config%');
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument(Client::class, 2, new Reference('nexy_slack.http.client'));
 
+        $this->assertContainerBuilderHasAlias('nexy_slack.client', Client::class);
         $this->assertContainerBuilderHasAlias('nexy_slack.http.client', 'httplug.client');
     }