diff --git a/tests/DrupalCI/Tests/Plugin/BuildSteps/generic/ContainerCommandTest.php b/tests/DrupalCI/Tests/Plugin/BuildSteps/generic/ContainerCommandTest.php
index 4cf1324..d6cfbde 100644
--- a/tests/DrupalCI/Tests/Plugin/BuildSteps/generic/ContainerCommandTest.php
+++ b/tests/DrupalCI/Tests/Plugin/BuildSteps/generic/ContainerCommandTest.php
@@ -7,7 +7,7 @@
 
 namespace DrupalCI\Tests\Plugin\BuildSteps\generic;
 
-use Docker\Container;
+use Docker\API\Model\Container;
 use DrupalCI\Plugin\BuildSteps\generic\ContainerCommand;
 use DrupalCI\Tests\DrupalCITestCase;
 
@@ -25,35 +25,59 @@ class ContainerCommandTest extends DrupalCITestCase {
 
     $body = $this->getMock('GuzzleHttp\Stream\StreamInterface');
 
-    $response = $this->getMock('GuzzleHttp\Message\ResponseInterface');
-    $response->expects($this->once())
-      ->method('getBody')
-      ->will($this->returnValue($body));
-
+    $docker = $this->getMockBuilder('Docker\Docker')
+      ->disableOriginalConstructor()
+      ->setMethods(['getExecManager', 'getContainerManager'])
+      ->getMock();
     $container_manager = $this->getMockBuilder('Docker\Manager\ContainerManager')
       ->disableOriginalConstructor()
       ->getMock();
-    $container_manager->expects($this->once())
-      ->method('find')
-      ->will($this->returnValue($instance));
-    $container_manager->expects($this->once())
-      ->method('exec')
-      ->with($instance, ['/bin/bash', '-c', $cmd], TRUE, TRUE, TRUE, TRUE)
-      ->will($this->returnValue(1));
-    $container_manager->expects($this->once())
-      ->method('execstart')
-      ->will($this->returnValue($response));
-    $container_manager->expects($this->once())
-      ->method('execinspect')
-      ->will($this->returnValue((object) ['ExitCode' => 0]));
-
-    $docker = $this->getMockBuilder('Docker\Docker')
+    $exec_manager = $this->getMockBuilder('Docker\Manager\ExecManager')
       ->disableOriginalConstructor()
-      ->setMethods(['getContainerManager'])
+      ->setMethods(['create', 'start', 'find'])
       ->getMock();
     $docker->expects($this->once())
       ->method('getContainerManager')
       ->will($this->returnValue($container_manager));
+    $docker->expects($this->once())
+      ->method('getExecManager')
+      ->will($this->returnValue($exec_manager));
+
+    $exec_result = $this->getMock('Docker\API\Model\ExecCreateResult');
+
+    $exec_result->expects($this->once())
+      ->method('getId');
+    $exec_manager->expects($this->once())
+      ->method('create')
+      ->will($this->returnValue($exec_result));
+
+    $exec_start_config = $this->getMockBuilder('Docker\API\Model\ExecStartConfig')
+      ->setMethods(['setTty', 'setDetach'])
+      ->getMock();
+    $exec_start_config->expects($this->once())
+      ->method('setTty')
+      ->will($this->returnValue($this->returnSelf()));
+    $exec_start_config->expects($this->once())
+      ->method('setDetach')
+      ->will($this->returnValue($this->returnSelf()));
+
+    $stream = $this->getMockBuilder('Docker\API\Model\DockerRawStream')
+      ->setMethods(['onStderr', 'onStdout', 'wait'])
+      ->getMock();
+
+    $exec_manager->expects($this->once())
+      ->method('start')
+      ->with($exec_start_config)    // $exec_start_config is the second parameter, need a string for $id
+      ->will($this->returnValue($stream));
+
+    $exec_command = $this->getMockBuilder('Docker\API\Model\ExecCommand')
+      ->setMethods(['getExitCode'])
+      ->getMock();
+    $exec_command->expects($this->once())
+      ->method('getExitCode');
+    $exec_manager->expects($this->once())
+      ->method('find')
+      ->will($this->returnValue($exec_command));
 
     $job = $this->getMockBuilder('DrupalCI\Plugin\JobTypes\JobInterface')
       ->getMockForAbstractClass();
@@ -62,7 +86,7 @@ class ContainerCommandTest extends DrupalCITestCase {
       ->will($this->returnValue($docker));
     $job->expects($this->once())
       ->method('getExecContainers')
-      ->will($this->returnValue(['php' => [['id' => 'dockerci/php-5.4']]]));
+      ->will($this->returnValue(['php' => [['id' => 'drupalci/php-5.4']]]));
 
     $command = new ContainerCommand();
     $command->run($job, $cmd);
diff --git a/tests/DrupalCI/Tests/Plugin/BuildSteps/setup/FetchTest.php b/tests/DrupalCI/Tests/Plugin/BuildSteps/setup/FetchTest.php
index 517d101..cfc730a 100644
--- a/tests/DrupalCI/Tests/Plugin/BuildSteps/setup/FetchTest.php
+++ b/tests/DrupalCI/Tests/Plugin/BuildSteps/setup/FetchTest.php
@@ -9,7 +9,7 @@ namespace DrupalCI\Tests\Plugin\BuildSteps\setup;
 
 use DrupalCI\Plugin\BuildSteps\setup\Fetch;
 use DrupalCI\Tests\DrupalCITestCase;
-use Guzzle\Http\ClientInterface;
+use GuzzleHttp\ClientInterface;
 
 /**
  * @coversDefaultClass DrupalCI\Plugin\BuildSteps\setup
@@ -23,20 +23,15 @@ class FetchTest extends DrupalCITestCase {
     $file = 'file.patch';
     $url = 'http://example.com/site/dir/' . $file;
     $dir = 'test/dir';
+    $param = ['send_to' => "$dir/$file"];
 
-    $request = $this->getMock('Guzzle\Http\Message\RequestInterface');
-    $request->expects($this->once())
-      ->method('setResponseBody')
-      ->with("$dir/$file")
-      ->will($this->returnSelf());
-    $request->expects($this->once())
-      ->method('send');
+    $response = $this->getMock('GuzzleHttp\Message\ResponseInterface');
 
-    $http_client = $this->getMock('Guzzle\Http\ClientInterface');
+    $http_client = $this->getMock('GuzzleHttp\ClientInterface');
     $http_client->expects($this->once())
       ->method('get')
       ->with($url)
-      ->will($this->returnValue($request));
+      ->will($this->returnValue($response));
 
     $job_codebase = $this->getMock('DrupalCI\Job\CodeBase\JobCodebase');
     $job = $this->getMockBuilder('DrupalCI\Plugin\JobTypes\JobInterface')