diff --git a/.travis.yml b/.travis.yml
index 61cc4b8c9b..65f41667f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -108,6 +108,30 @@ env:
       PIO_SPARK_VERSION=2.1.1
       PIO_ELASTICSEARCH_VERSION=5.5.2
 
+    - BUILD_TYPE=Unit
+      METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
+      PIO_SCALA_VERSION=2.11.8
+      PIO_SPARK_VERSION=2.2.0
+    - BUILD_TYPE=Integration
+      METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
+      PIO_SCALA_VERSION=2.11.8
+      PIO_SPARK_VERSION=2.2.0
+    - BUILD_TYPE=Integration
+      METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
+      PIO_SCALA_VERSION=2.11.8
+      PIO_SPARK_VERSION=2.2.0
+      PIO_ELASTICSEARCH_VERSION=1.7.3
+    - BUILD_TYPE=Integration
+      METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
+      PIO_SCALA_VERSION=2.11.8
+      PIO_SPARK_VERSION=2.2.0
+      PIO_ELASTICSEARCH_VERSION=5.5.2
+    - BUILD_TYPE=Integration
+      METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3
+      PIO_SCALA_VERSION=2.11.8
+      PIO_SPARK_VERSION=2.2.0
+      PIO_ELASTICSEARCH_VERSION=5.5.2
+
     - BUILD_TYPE=LicenseCheck
 
 before_install:
diff --git a/build.sbt b/build.sbt
index a02bdd9ff3..826016e63f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -40,6 +40,10 @@ lazy val scalaSparkDepsVersion = Map(
       "hadoop" -> "2.7.3",
       "json4s" -> "3.2.11"),
     "2.1" -> Map(
+      "akka" -> "2.4.17",
+      "hadoop" -> "2.7.3",
+      "json4s" -> "3.2.11"),
+    "2.2" -> Map(
       "akka" -> "2.4.17",
       "hadoop" -> "2.7.3",
       "json4s" -> "3.2.11")))
diff --git a/data/build.sbt b/data/build.sbt
index abfa74fc72..87b0d96a23 100644
--- a/data/build.sbt
+++ b/data/build.sbt
@@ -21,6 +21,7 @@ name := "apache-predictionio-data"
 
 libraryDependencies ++= Seq(
   "com.github.nscala-time" %% "nscala-time"    % "2.6.0",
+  "com.google.guava"        % "guava"          % "14.0.1",
   "io.spray"               %% "spray-can"      % "1.3.3",
   "io.spray"               %% "spray-routing"  % "1.3.3",
   "io.spray"               %% "spray-testkit"  % "1.3.3" % "test",
diff --git a/tests/docker-files/env-conf/hbase-site.xml b/tests/docker-files/env-conf/hbase-site.xml
index 3d5363e12f..40670f0bd7 100644
--- a/tests/docker-files/env-conf/hbase-site.xml
+++ b/tests/docker-files/env-conf/hbase-site.xml
@@ -21,4 +21,9 @@ limitations under the License.
     <name>hbase.zookeeper.quorum</name>
     <value>hbase</value>
   </property>
+  <!-- https://issues.apache.org/jira/browse/SPARK-21549 -->
+  <property>
+    <name>mapreduce.output.fileoutputformat.outputdir</name>
+    <value>/tmp</value>
+  </property>
 </configuration>