diff --git a/.travis.yml b/.travis.yml
index 92b92280..41921e31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
 sudo: false
 
 install:
-  - COMPOSER_ROOT_VERSION=`git describe --abbrev=0` composer install --no-interaction
+  - composer install --no-interaction
 
 script:
   - vendor/bin/phpunit --coverage-text
diff --git a/README.md b/README.md
index a1e0a5d9..0ee8b69b 100644
--- a/README.md
+++ b/README.md
@@ -163,12 +163,10 @@ It's *highly recommended to use PHP 7+* for this project.
 ## Tests
 
 To run the test suite, you first need to clone this repo and then install all
-dependencies [through Composer](https://getcomposer.org).
-Because the test suite contains some circular dependencies, you may have to
-manually specify the root package version like this:
+dependencies [through Composer](https://getcomposer.org):
 
 ```bash
-$ COMPOSER_ROOT_VERSION=`git describe --abbrev=0` composer install
+$ composer install
 ```
 
 To run the test suite, go to the project root and run:
diff --git a/composer.json b/composer.json
index 0c6cf7d8..510a43c1 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,6 @@
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
         "react/promise": "^2.1 || ^1.2.1",
         "react/promise-timer": "^1.2",
-        "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5 || ^0.4.4",
         "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.5"
     },
     "require-dev": {
diff --git a/tests/Query/ExecutorTest.php b/tests/Query/ExecutorTest.php
index a95a1913..0d7ac1db 100644
--- a/tests/Query/ExecutorTest.php
+++ b/tests/Query/ExecutorTest.php
@@ -279,7 +279,7 @@ private function returnNewConnectionMock($emitData = true)
 
     private function createConnectionMock($emitData = true)
     {
-        $conn = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
+        $conn = $this->getMockBuilder('React\Stream\DuplexStreamInterface')->getMock();
         $conn
             ->expects($this->any())
             ->method('on')