diff --git a/tests/Concerns/GenerateFakePlugins.php b/tests/Concerns/GeneratesFakePlugins.php
similarity index 99%
rename from tests/Concerns/GenerateFakePlugins.php
rename to tests/Concerns/GeneratesFakePlugins.php
index 1cd7f20b..e388ba72 100644
--- a/tests/Concerns/GenerateFakePlugins.php
+++ b/tests/Concerns/GeneratesFakePlugins.php
@@ -1,6 +1,6 @@
 <?php
 
-trait GenerateFakePlugins
+trait GeneratesFakePlugins
 {
     /**
      * Generate fake content of a plugin's package.json.
diff --git a/tests/Concerns/MockGuzzleClient.php b/tests/Concerns/MocksGuzzleClient.php
similarity index 98%
rename from tests/Concerns/MockGuzzleClient.php
rename to tests/Concerns/MocksGuzzleClient.php
index f1c424f1..76cb46ed 100644
--- a/tests/Concerns/MockGuzzleClient.php
+++ b/tests/Concerns/MocksGuzzleClient.php
@@ -11,7 +11,7 @@ use GuzzleHttp\Exception\RequestException;
  * @see http://docs.guzzlephp.org/en/stable/testing.html
  * @see https://christrombley.me/blog/testing-guzzle-6-responses-with-laravel
  */
-trait MockGuzzleClient
+trait MocksGuzzleClient
 {
     public $guzzleMockHandler;
 
diff --git a/tests/MarketControllerTest.php b/tests/MarketControllerTest.php
index fd626963..dc1cbe3a 100644
--- a/tests/MarketControllerTest.php
+++ b/tests/MarketControllerTest.php
@@ -6,7 +6,8 @@ use GuzzleHttp\Exception\RequestException;
 
 class MarketControllerTest extends TestCase
 {
-    use GenerateFakePlugins;
+    use MocksGuzzleClient;
+    use GeneratesFakePlugins;
 
     protected function setUp()
     {
diff --git a/tests/PluginControllerTest.php b/tests/PluginControllerTest.php
index c280b070..eabcc0f4 100644
--- a/tests/PluginControllerTest.php
+++ b/tests/PluginControllerTest.php
@@ -6,7 +6,7 @@ use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class PluginControllerTest extends TestCase
 {
-    use GenerateFakePlugins;
+    use GeneratesFakePlugins;
     use DatabaseTransactions;
 
     protected function setUp()
diff --git a/tests/TestCase.php b/tests/TestCase.php
index eb9d470a..51838667 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,7 +2,6 @@
 
 class TestCase extends Illuminate\Foundation\Testing\TestCase
 {
-    use MockGuzzleClient;
     use InteractsWithCache;
 
     /**
diff --git a/tests/UpdateControllerTest.php b/tests/UpdateControllerTest.php
index d03ef86d..524bb7bd 100644
--- a/tests/UpdateControllerTest.php
+++ b/tests/UpdateControllerTest.php
@@ -10,6 +10,7 @@ use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class UpdateControllerTest extends TestCase
 {
+    use MocksGuzzleClient;
     use DatabaseTransactions;
 
     protected function setUp()