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 bffdec6..de8728d 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
@@ -32,14 +32,14 @@ import org.apache.spark.sql.functions._
  *
  * @param sqlContext An existing SQLContext.
  */
-abstract class Benchmark(@transient protected val sqlContext: SQLContext)
+abstract class Benchmark(
+    @transient protected val sqlContext: SQLContext,
+    val resultsLocation: String = "/spark/sql/performance",
+    val resultsTableName: String = "sqlPerformance")
   extends Serializable {
 
   import sqlContext.implicits._
 
-  val resultsLocation = "/spark/sql/performance"
-  val resultsTableName = "sqlPerformance"
-
   def createResultsTable() = {
     sqlContext.sql(s"DROP TABLE $resultsTableName")
     sqlContext.createExternalTable(
diff --git a/src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala b/src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala
index dab3fbd..fdda692 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS.scala
@@ -23,8 +23,12 @@ import org.apache.spark.sql.SQLContext
  * TPC-DS benchmark's dataset.
  * @param sqlContext An existing SQLContext.
  */
-class TPCDS (@transient sqlContext: SQLContext)
-  extends Benchmark(sqlContext) with ImpalaKitQueries with SimpleQueries with Serializable {
+class TPCDS (
+    @transient sqlContext: SQLContext,
+    resultsLocation: String = "/spark/sql/performance",
+    resultsTableName: String = "sqlPerformance")
+  extends Benchmark(sqlContext, resultsLocation, resultsTableName)
+  with ImpalaKitQueries with SimpleQueries with Serializable {
 
   /*
   def setupBroadcast(skipTables: Seq[String] = Seq("store_sales", "customer")) = {