diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecdde53..204525e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,12 +3,16 @@
 
 ## Unreleased
 
+### Added
+
+- MockClientStrategy class.
+
 ## 1.1.1 - 2016-11-27
 
 ### Changed
 
 - Made exception messages clearer. `StrategyUnavailableException` is no longer the previous exception to `DiscoveryFailedException`.
-- `CommonClassesStrategy` is using `self` instead of `static`. Using `static` makes no sense when `CommonClassesStrategy` is final. 
+- `CommonClassesStrategy` is using `self` instead of `static`. Using `static` makes no sense when `CommonClassesStrategy` is final.
 
 ## 1.1.0 - 2016-10-20
 
diff --git a/src/Strategy/MockClientStrategy.php b/src/Strategy/MockClientStrategy.php
new file mode 100644
index 0000000..f200c1b
--- /dev/null
+++ b/src/Strategy/MockClientStrategy.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Http\Discovery\Strategy;
+
+use Http\Client\HttpClient;
+use Http\Mock\Client as Mock;
+
+/**
+ * Find the Mock client.
+ *
+ * @author Sam Rapaport <me@samrapdev.com>
+ */
+final class MockClientStrategy implements DiscoveryStrategy
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getCandidates($type)
+    {
+        return ($type === HttpClient::class)
+            ? ['class' => Mock::class, 'condition' => Mock::class]
+            : [];
+    }
+}