diff --git a/flexible/sparkjava/pom.xml b/flexible/sparkjava/pom.xml
index 9739f03cc47..17608523944 100644
--- a/flexible/sparkjava/pom.xml
+++ b/flexible/sparkjava/pom.xml
@@ -19,6 +19,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
 
     <appengine.maven.plugin>1.0.0</appengine.maven.plugin>
+    <app.stage.artifact>${project.build.directory}/spark-1.0-jar-with-dependencies.jar</app.stage.artifact>
   </properties>
 
   <dependencies>
@@ -44,8 +45,8 @@
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud</artifactId>
-      <version>0.4.0</version>
+      <artifactId>google-cloud-datastore</artifactId>
+      <version>0.8.1-beta</version>
     </dependency>
   </dependencies>
   <build>
@@ -83,7 +84,7 @@
           <mainClass>com.google.appengine.sparkdemo.Main</mainClass>
           <arguments>
             <argument>-jar</argument>
-            <argument>target/spark-1.0-jar-with-dependencies.jar</argument>
+            <argument>${app.stage.stagingDirectory}/spark-1.0-jar-with-dependencies.jar</argument>
           </arguments>
         </configuration>
       </plugin>
diff --git a/flexible/sparkjava/src/main/appengine/Dockerfile b/flexible/sparkjava/src/main/docker/Dockerfile
similarity index 100%
rename from flexible/sparkjava/src/main/appengine/Dockerfile
rename to flexible/sparkjava/src/main/docker/Dockerfile
diff --git a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
index 471f57384ab..67a3735ff6b 100644
--- a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
+++ b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
@@ -31,6 +31,7 @@
 import com.google.cloud.datastore.testing.LocalDatastoreHelper;
 import com.google.common.collect.Iterators;
 
+import org.joda.time.Duration;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -38,6 +39,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.TimeoutException;
 
 public class UserServiceTest {
 
@@ -72,8 +74,8 @@ public void setUp() {
   }
 
   @AfterClass
-  public static void afterClass() throws IOException, InterruptedException {
-    HELPER.stop();
+  public static void afterClass() throws IOException, InterruptedException, TimeoutException {
+    HELPER.stop(Duration.standardMinutes(1));
   }
 
   @Test
diff --git a/pom.xml b/pom.xml
index aec079812a8..f9d9d0d28e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,9 +98,7 @@
         <module>flexible/mailjet</module>
         <module>flexible/memcache</module>
         <module>flexible/sendgrid</module>
-<!--
         <module>flexible/sparkjava</module>
- -->
         <module>flexible/static-files</module>
         <module>flexible/twilio</module>
         <module>language/analysis</module>