diff --git a/build.sbt b/build.sbt
index 82b4477..e802040 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,7 +8,7 @@ sparkPackageName := "databricks/spark-sql-perf"
 // All Spark Packages need a license
 licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
 
-sparkVersion := "1.4.1"
+sparkVersion := "1.6.0-SNAPSHOT"
 
 sparkComponents ++= Seq("sql", "hive")
 
diff --git a/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala b/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
index 3ca6736..4aa8b2e 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
@@ -137,7 +137,7 @@ abstract class Benchmark(
       val resultsFuture = Future {
         queriesToRun.flatMap { query =>
           query.newDataFrame().queryExecution.logical.collect {
-            case UnresolvedRelation(Seq(name), _) => name
+            case UnresolvedRelation(t, _) => t.table
           }
         }.distinct.foreach { name =>
           try {
@@ -432,7 +432,7 @@ abstract class Benchmark(
     lazy val tablesInvolved = buildDataFrame.queryExecution.logical collect {
       case UnresolvedRelation(tableIdentifier, _) => {
         // We are ignoring the database name.
-        tableIdentifier.last
+        tableIdentifier.table
       }
     }