diff --git a/bigquery/cloud-client/pom.xml b/bigquery/cloud-client/pom.xml
index 3120ca2bb63..aef17e92743 100644
--- a/bigquery/cloud-client/pom.xml
+++ b/bigquery/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
-      <version>0.7.0</version>
+      <version>0.8.0-beta</version>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/datastore/cloud-client/pom.xml b/datastore/cloud-client/pom.xml
index a6eaef9a295..ca35eda02e7 100644
--- a/datastore/cloud-client/pom.xml
+++ b/datastore/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>0.7.0</version>
+      <version>0.8.0-beta</version>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/datastore/pom.xml b/datastore/pom.xml
index 1ecc14bd3da..464a6c1ae3e 100644
--- a/datastore/pom.xml
+++ b/datastore/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>0.7.0</version>
+      <version>0.8.0-beta</version>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index e00b09011e6..8970e83e2ba 100644
--- a/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -51,6 +51,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterators;
 
+import org.joda.time.Duration;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -72,6 +73,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.TimeoutException;
 
 /**
  * Contains Cloud Datastore snippets demonstrating concepts for documentation.
@@ -133,8 +135,8 @@ public void setUp() {
    * @throws InterruptedException if there are errors stopping the local Datastore
    */
   @AfterClass
-  public static void afterClass() throws IOException, InterruptedException {
-    HELPER.stop();
+  public static void afterClass() throws IOException, InterruptedException, TimeoutException {
+    HELPER.stop(Duration.standardMinutes(1));
   }
 
   private void assertValidKey(Key taskKey) {
diff --git a/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml
index 3852e2f67f5..50e617fb250 100644
--- a/flexible/cloudstorage/pom.xml
+++ b/flexible/cloudstorage/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>0.7.0</version>
+      <version>0.8.0-beta</version>
     </dependency>
     <!-- [END dependencies] -->
   </dependencies>
diff --git a/flexible/datastore/pom.xml b/flexible/datastore/pom.xml
index c864cd23d0c..79db82eec6c 100644
--- a/flexible/datastore/pom.xml
+++ b/flexible/datastore/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>0.7.0</version>
+      <version>0.8.0-beta</version>
     </dependency>
     <!-- [END dependencies] -->
   </dependencies>
diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml
index 81f665847b4..efd74f31603 100644
--- a/language/cloud-client/pom.xml
+++ b/language/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-language</artifactId>
-      <version>0.7.0</version>
+      <version>0.8.0</version>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/logging/cloud-client/pom.xml b/logging/cloud-client/pom.xml
index b7b774c3afb..8761a2c2af4 100644
--- a/logging/cloud-client/pom.xml
+++ b/logging/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-logging</artifactId>
-      <version>0.7.0</version>
+      <version>0.8.0-beta</version>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/pom.xml b/pom.xml
index 9bad95df8c3..12ceb35d531 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,7 @@
         <module>flexible/static-files</module>
         <module>flexible/twilio</module>
         <module>language/analysis</module>
+        <module>language/cloud-client</module>
         <module>logging</module>
         <module>logging/cloud-client</module>
         <module>monitoring/v2</module>
diff --git a/storage/cloud-client/pom.xml b/storage/cloud-client/pom.xml
index bfed75267b9..ff4fcd8bf5c 100644
--- a/storage/cloud-client/pom.xml
+++ b/storage/cloud-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>0.7.0</version>
+      <version>0.8.0-beta</version>
     </dependency>
 
     <!-- Test dependencies -->