diff --git a/.travis.yml b/.travis.yml
index 6439e06..05f7fbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,10 @@ jdk:
 # https://github.com/apache/zeppelin/blob/master/spark-dependencies/pom.xml for supported combinations
 env:
   matrix:
-    - ZEPPELIN_VERSION=v0.6.2 SPARK_VERSION=1.6.3 HADOOP_VERSION=2.6
-    - ZEPPELIN_VERSION=v0.6.2 SPARK_VERSION=2.0.2 HADOOP_VERSION=2.7
-    - ZEPPELIN_VERSION=v0.6.2 SPARK_VERSION=2.1.1 HADOOP_VERSION=2.7
     - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=1.6.3 HADOOP_VERSION=2.6
     - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=2.0.2 HADOOP_VERSION=2.7
     - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=2.1.1 HADOOP_VERSION=2.7
+    - ZEPPELIN_VERSION=v0.7.1 SPARK_VERSION=2.2.0 HADOOP_VERSION=2.7
 
 before_script:
   - sudo apt-get update
diff --git a/Dockerfile b/Dockerfile
index 85c160b..f231568 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN \
   apt-get clean all
 
 RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
-  wget --quiet https://repo.continuum.io/archive/Anaconda2-4.2.0-Linux-x86_64.sh -O ~/anaconda.sh && \
+  wget --quiet https://repo.continuum.io/archive/Anaconda3-4.2.0-Linux-x86_64.sh -O ~/anaconda.sh && \
   /bin/bash ~/anaconda.sh -b -p /opt/conda && \
   rm ~/anaconda.sh
 
diff --git a/build b/build
index 1e21c62..8bab289 100755
--- a/build
+++ b/build
@@ -11,6 +11,9 @@ case "$spark_version" in
   "2.1"*)
     zeppelin_spark_version="2.1"
     ;;
+  "2.2"*)
+    zeppelin_spark_version="2.2"
+    ;;
   *)
     echo "Spark version '$spark_version' not supported."
     exit 1