diff --git a/CHANGELOG b/CHANGELOG
index 2ec1b4c..076e348 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-# dev
+### 1.0.5
 
-- Convert general `\RuntimeException` to more specific
+- Convert general `RuntimeException` to more specific
   `Amp\CombinatorException`.
 
 ### 1.0.4
diff --git a/lib/CombinatorException.php b/lib/CombinatorException.php
index 1448253..518bba7 100644
--- a/lib/CombinatorException.php
+++ b/lib/CombinatorException.php
@@ -2,6 +2,4 @@
 
 namespace Amp;
 
-class CombinatorException extends \RuntimeException {
-
-}
\ No newline at end of file
+class CombinatorException extends \RuntimeException {}
\ No newline at end of file
diff --git a/test/FunctionsTest.php b/test/FunctionsTest.php
index a4b4ada..831968e 100644
--- a/test/FunctionsTest.php
+++ b/test/FunctionsTest.php
@@ -412,7 +412,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Amp\CombinatorException
      */
     public function testSomeThrowsIfNoPromisesResolveSuccessfully() {
         \Amp\some([
@@ -481,7 +481,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Amp\CombinatorException
      * @expectedExceptionMessage All promises failed
      */
     public function testFirstFailsIfAllPromisesFail() {
@@ -494,7 +494,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Amp\TimeoutException
      * @expectedExceptionMessage Promise resolution timed out
      */
     public function testTimeout() {
@@ -521,7 +521,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
     }
 
     /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      * @expectedExceptionMessage nothing that is worth knowing can be taught
      */
     public function testTimeoutOnFailure() {
@@ -625,7 +625,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Amp\CombinatorException
      */
     public function testExplicitSomeCombinatorResolutionFailsOnError() {
         \Amp\run(function () {