diff --git a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraConnector.java b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraConnector.java
index eb53bb40a348..2565708f7a8c 100644
--- a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraConnector.java
+++ b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraConnector.java
@@ -64,7 +64,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
 import static com.facebook.presto.spi.type.BigintType.BIGINT;
 import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
 import static com.facebook.presto.spi.type.DoubleType.DOUBLE;
@@ -80,7 +79,7 @@
 
 public class TestCassandraConnector
 {
-    private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
+    private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
     protected static final String INVALID_DATABASE = "totally_invalid_database";
 
     private ConnectorMetadata metadata;
diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplit.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplit.java
index b793ae7b35ed..fccdfc154b62 100644
--- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplit.java
+++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplit.java
@@ -22,13 +22,12 @@
 import java.util.Locale;
 import java.util.Properties;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
 import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
 import static org.testng.Assert.assertEquals;
 
 public class TestHiveSplit
 {
-    private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
+    private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
     private final JsonCodec<HiveSplit> codec = JsonCodec.jsonCodec(HiveSplit.class);
 
     @Test
diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveTableHandle.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveTableHandle.java
index 1d4bdb7f4aa9..caa964ccb291 100644
--- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveTableHandle.java
+++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveTableHandle.java
@@ -19,13 +19,12 @@
 
 import java.util.Locale;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
 import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
 import static org.testng.Assert.assertEquals;
 
 public class TestHiveTableHandle
 {
-    private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
+    private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
     private final JsonCodec<HiveTableHandle> codec = JsonCodec.jsonCodec(HiveTableHandle.class);
 
     @Test
diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestJsonHiveHandles.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestJsonHiveHandles.java
index 33062fc54ddf..e5248c6caa5c 100644
--- a/presto-hive/src/test/java/com/facebook/presto/hive/TestJsonHiveHandles.java
+++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestJsonHiveHandles.java
@@ -24,7 +24,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
 import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
 import static io.airlift.testing.Assertions.assertEqualsIgnoreOrder;
 import static org.testng.Assert.assertEquals;
@@ -33,7 +32,7 @@
 @Test
 public class TestJsonHiveHandles
 {
-    private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
+    private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
 
     private static final Map<String, Object> TABLE_HANDLE_AS_MAP = ImmutableMap.<String, Object>of(
             "clientId", "hive",
diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestDriver.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestDriver.java
index fc2a27a81f28..aa82a49af582 100644
--- a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestDriver.java
+++ b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestDriver.java
@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.Set;
 
+import static com.facebook.presto.server.testing.TestingPrestoServer.TEST_CATALOG;
 import static java.lang.String.format;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -203,7 +204,7 @@ public void testGetSchemas()
                 assertGetSchemasResult(rs, 2);
             }
 
-            try (ResultSet rs = connection.getMetaData().getSchemas("default", null)) {
+            try (ResultSet rs = connection.getMetaData().getSchemas(TEST_CATALOG, null)) {
                 assertGetSchemasResult(rs, 2);
             }
 
@@ -212,7 +213,7 @@ public void testGetSchemas()
                 assertGetSchemasResult(rs, 0);
             }
 
-            try (ResultSet rs = connection.getMetaData().getSchemas("default", "sys")) {
+            try (ResultSet rs = connection.getMetaData().getSchemas(TEST_CATALOG, "sys")) {
                 assertGetSchemasResult(rs, 1);
             }
 
@@ -240,7 +241,7 @@ public void testGetSchemas()
                 assertGetSchemasResult(rs, 0);
             }
 
-            try (ResultSet rs = connection.getMetaData().getSchemas("default", "unknown")) {
+            try (ResultSet rs = connection.getMetaData().getSchemas(TEST_CATALOG, "unknown")) {
                 assertGetSchemasResult(rs, 0);
             }
 
@@ -250,7 +251,7 @@ public void testGetSchemas()
         }
     }
 
-    private void assertGetSchemasResult(ResultSet rs, int expectedRows)
+    private static void assertGetSchemasResult(ResultSet rs, int expectedRows)
             throws SQLException
     {
         assertRowCount(rs, expectedRows);
@@ -281,7 +282,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", null, null, null)) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, null, null, null)) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -302,7 +303,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", null, null)) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", null, null)) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -313,7 +314,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "", null, null)) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "", null, null)) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -322,7 +323,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", null)) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", null)) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -333,7 +334,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", new String[] {"BASE TABLE"})) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", new String[] {"BASE TABLE"})) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -377,7 +378,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "inf%", "tables", null)) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "inf%", "tables", null)) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -388,7 +389,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tab%", null)) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tab%", null)) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -411,7 +412,7 @@ public void testGetTables()
 
         // todo why does Presto require that the schema name be lower case
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "unknown", "tables", new String[] {"BASE TABLE"})) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "unknown", "tables", new String[] {"BASE TABLE"})) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -422,7 +423,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "unknown", new String[] {"BASE TABLE"})) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "unknown", new String[] {"BASE TABLE"})) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -433,7 +434,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", new String[] {"unknown"})) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", new String[] {"unknown"})) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -444,7 +445,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", new String[] {"unknown", "BASE TABLE"})) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", new String[] {"unknown", "BASE TABLE"})) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -455,7 +456,7 @@ public void testGetTables()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", new String[] {})) {
+            try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", new String[] {})) {
                 assertTableMetadata(rs);
 
                 Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
@@ -468,10 +469,10 @@ public void testGetTables()
 
     private static List<Object> getTablesRow(String schema, String table)
     {
-        return ImmutableList.<Object>of("default", schema, table, "BASE TABLE", "", "", "", "", "", "");
+        return ImmutableList.<Object>of(TEST_CATALOG, schema, table, "BASE TABLE", "", "", "", "", "", "");
     }
 
-    private void assertTableMetadata(ResultSet rs)
+    private static void assertTableMetadata(ResultSet rs)
             throws SQLException
     {
         ResultSetMetaData metadata = rs.getMetaData();
@@ -538,7 +539,7 @@ public void testGetColumns()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getColumns("default", null, "tables", "column_name")) {
+            try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, null, "tables", "column_name")) {
                 assertColumnMetadata(rs);
             }
         }
@@ -550,31 +551,31 @@ public void testGetColumns()
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getColumns("default", "information_schema", "tables", "column_name")) {
+            try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "information_schema", "tables", "column_name")) {
                 assertColumnMetadata(rs);
             }
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getColumns("default", "inf%", "tables", "column_name")) {
+            try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "inf%", "tables", "column_name")) {
                 assertColumnMetadata(rs);
             }
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getColumns("default", "information_schema", "tab%", "column_name")) {
+            try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "information_schema", "tab%", "column_name")) {
                 assertColumnMetadata(rs);
             }
         }
 
         try (Connection connection = createConnection()) {
-            try (ResultSet rs = connection.getMetaData().getColumns("default", "information_schema", "tables", "col%")) {
+            try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "information_schema", "tables", "col%")) {
                 assertColumnMetadata(rs);
             }
         }
     }
 
-    private void assertColumnMetadata(ResultSet rs)
+    private static void assertColumnMetadata(ResultSet rs)
             throws SQLException
     {
         ResultSetMetaData metadata = rs.getMetaData();
@@ -751,26 +752,26 @@ public void testConnectionStringWithCatalogAndSchema()
 
         connection = DriverManager.getConnection(prefix + "/a/", "test", null);
         assertEquals(connection.getCatalog(), "a");
-        assertEquals(connection.getSchema(), "default");
+        assertEquals(connection.getSchema(), TEST_CATALOG);
 
         connection = DriverManager.getConnection(prefix + "/a", "test", null);
         assertEquals(connection.getCatalog(), "a");
-        assertEquals(connection.getSchema(), "default");
+        assertEquals(connection.getSchema(), TEST_CATALOG);
 
         connection = DriverManager.getConnection(prefix + "/", "test", null);
-        assertEquals(connection.getCatalog(), "default");
-        assertEquals(connection.getSchema(), "default");
+        assertEquals(connection.getCatalog(), TEST_CATALOG);
+        assertEquals(connection.getSchema(), TEST_CATALOG);
 
-        connection = DriverManager.getConnection(prefix + "", "test", null);
-        assertEquals(connection.getCatalog(), "default");
-        assertEquals(connection.getSchema(), "default");
+        connection = DriverManager.getConnection(prefix, "test", null);
+        assertEquals(connection.getCatalog(), TEST_CATALOG);
+        assertEquals(connection.getSchema(), TEST_CATALOG);
     }
 
     @Test
     public void testConnectionWithCatalogAndSchema()
             throws Exception
     {
-        try (Connection connection = createConnection("default", "information_schema")) {
+        try (Connection connection = createConnection(TEST_CATALOG, "information_schema")) {
             try (Statement statement = connection.createStatement()) {
                 try (ResultSet rs = statement.executeQuery("" +
                         "SELECT table_catalog, table_schema " +
@@ -781,7 +782,7 @@ public void testConnectionWithCatalogAndSchema()
                     assertEquals(metadata.getColumnLabel(1), "table_catalog");
                     assertEquals(metadata.getColumnLabel(2), "table_schema");
                     assertTrue(rs.next());
-                    assertEquals(rs.getString("table_catalog"), "default");
+                    assertEquals(rs.getString("table_catalog"), TEST_CATALOG);
                 }
             }
         }
@@ -791,7 +792,7 @@ public void testConnectionWithCatalogAndSchema()
     public void testConnectionWithCatalog()
             throws Exception
     {
-        try (Connection connection = createConnection("default")) {
+        try (Connection connection = createConnection(TEST_CATALOG)) {
             try (Statement statement = connection.createStatement()) {
                 try (ResultSet rs = statement.executeQuery("" +
                         "SELECT table_catalog, table_schema " +
@@ -802,7 +803,7 @@ public void testConnectionWithCatalog()
                     assertEquals(metadata.getColumnLabel(1), "table_catalog");
                     assertEquals(metadata.getColumnLabel(2), "table_schema");
                     assertTrue(rs.next());
-                    assertEquals(rs.getString("table_catalog"), "default");
+                    assertEquals(rs.getString("table_catalog"), TEST_CATALOG);
                 }
             }
         }
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java b/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java
index 369f901a2443..08d1f0448798 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java
@@ -31,8 +31,6 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKey;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKeyForOffset;
 import static com.facebook.presto.util.DateTimeZoneIndex.getDateTimeZone;
@@ -72,7 +70,7 @@ public class TestDateTimeFunctions
     @BeforeClass
     public void setUp()
     {
-        session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TIME_ZONE_KEY, Locale.ENGLISH, null, null);
+        session = new Session("user", "test", "catalog", "schema", TIME_ZONE_KEY, Locale.ENGLISH, null, null);
         functionAssertions = new FunctionAssertions(session);
     }
 
@@ -616,7 +614,7 @@ public void testDateParse()
     public void testLocale()
     {
         Locale locale = Locale.JAPANESE;
-        session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TIME_ZONE_KEY, locale, null, null);
+        session = new Session("user", "test", "catalog", "schema", TIME_ZONE_KEY, locale, null, null);
 
         functionAssertions = new FunctionAssertions(session);
 
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java b/presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java
index 03fab38a1604..bbd1f8b6d9e2 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java
@@ -42,8 +42,6 @@
 import java.util.concurrent.TimeUnit;
 
 import static com.facebook.presto.connector.dual.DualMetadata.DUAL_METADATA_MANAGER;
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.BigintType.BIGINT;
 import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
 import static com.facebook.presto.spi.type.DateType.DATE;
@@ -67,7 +65,7 @@
 
 public class TestExpressionInterpreter
 {
-    private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, UTC_KEY, Locale.ENGLISH, null, null);
+    private static final Session SESSION = new Session("user", "test", "catalog", "schema", UTC_KEY, Locale.ENGLISH, null, null);
     private static final Map<Symbol, Type> SYMBOL_TYPES = ImmutableMap.<Symbol, Type>builder()
             .put(new Symbol("bound_long"), BIGINT)
             .put(new Symbol("bound_string"), VARCHAR)
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedFilterFunction.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedFilterFunction.java
index 0b5d5be7f4ed..52a2a3fdb517 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedFilterFunction.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedFilterFunction.java
@@ -25,8 +25,6 @@
 
 import static com.facebook.presto.connector.dual.DualMetadata.DUAL_METADATA_MANAGER;
 import static com.facebook.presto.operator.scalar.FunctionAssertions.createExpression;
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
 import static java.lang.String.format;
 import static org.testng.Assert.assertEquals;
@@ -195,7 +193,7 @@ public void testComparisonExpressionWithNulls()
     public static void assertFilter(String expression, boolean expectedValue)
     {
         Expression parsed = createExpression(expression, DUAL_METADATA_MANAGER, ImmutableMap.<Symbol, Type>of());
-        Session session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, UTC_KEY, Locale.ENGLISH, null, null);
+        Session session = new Session("user", "test", "catalog", "schema", UTC_KEY, Locale.ENGLISH, null, null);
 
         InterpretedFilterFunction filterFunction = new InterpretedFilterFunction(parsed,
                 ImmutableMap.<Symbol, Type>of(),
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedProjectionFunction.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedProjectionFunction.java
index a5b64426f9f5..0754699ae167 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedProjectionFunction.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedProjectionFunction.java
@@ -171,7 +171,7 @@ private static void assertProjection(
                 symbolTypes.build(),
                 symbolToInputMappings,
                 DUAL_METADATA_MANAGER,
-                new Session("user", "test", Session.DEFAULT_CATALOG, Session.DEFAULT_SCHEMA, UTC_KEY, Locale.ENGLISH, null, null)
+                new Session("user", "test", "catalog", "schema", UTC_KEY, Locale.ENGLISH, null, null)
         );
 
         // create output
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestDate.java b/presto-main/src/test/java/com/facebook/presto/type/TestDate.java
index c64edb493f84..d106998ff464 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestDate.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestDate.java
@@ -27,8 +27,6 @@
 
 import java.util.Locale;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKey;
 import static com.facebook.presto.util.DateTimeZoneIndex.getDateTimeZone;
 
@@ -42,7 +40,7 @@ public class TestDate
     @BeforeClass
     public void setUp()
     {
-        Session session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TIME_ZONE_KEY, Locale.ENGLISH, null, null);
+        Session session = new Session("user", "test", "catalog", "schema", TIME_ZONE_KEY, Locale.ENGLISH, null, null);
         functionAssertions = new FunctionAssertions(session);
     }
 
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestDateTimeOperators.java b/presto-main/src/test/java/com/facebook/presto/type/TestDateTimeOperators.java
index 5d17fce78d8d..368d846d50b2 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestDateTimeOperators.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestDateTimeOperators.java
@@ -28,8 +28,6 @@
 
 import java.util.Locale;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKey;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKeyForOffset;
 import static com.facebook.presto.util.DateTimeZoneIndex.getDateTimeZone;
@@ -49,7 +47,7 @@ public class TestDateTimeOperators
     @BeforeClass
     public void setUp()
     {
-        session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TIME_ZONE_KEY, Locale.ENGLISH, null, null);
+        session = new Session("user", "test", "catalog", "schema", TIME_ZONE_KEY, Locale.ENGLISH, null, null);
         functionAssertions = new FunctionAssertions(session);
     }
 
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestTime.java b/presto-main/src/test/java/com/facebook/presto/type/TestTime.java
index a611a273bb65..fa0e5dbd60ac 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestTime.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestTime.java
@@ -27,8 +27,6 @@
 
 import java.util.Locale;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKey;
 import static com.facebook.presto.util.DateTimeZoneIndex.getDateTimeZone;
 
@@ -42,7 +40,7 @@ public class TestTime
     @BeforeClass
     public void setUp()
     {
-        Session session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TIME_ZONE_KEY, Locale.ENGLISH, null, null);
+        Session session = new Session("user", "test", "catalog", "schema", TIME_ZONE_KEY, Locale.ENGLISH, null, null);
         functionAssertions = new FunctionAssertions(session);
     }
 
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestTimeWithTimeZone.java b/presto-main/src/test/java/com/facebook/presto/type/TestTimeWithTimeZone.java
index 54cd01a12bd7..d2904de30551 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestTimeWithTimeZone.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestTimeWithTimeZone.java
@@ -27,8 +27,6 @@
 
 import java.util.Locale;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKeyForOffset;
 
 public class TestTimeWithTimeZone
@@ -42,7 +40,7 @@ public class TestTimeWithTimeZone
     @BeforeClass
     public void setUp()
     {
-        session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TimeZoneKey.getTimeZoneKey("+06:09"), Locale.ENGLISH, null, null);
+        session = new Session("user", "test", "catalog", "schema", TimeZoneKey.getTimeZoneKey("+06:09"), Locale.ENGLISH, null, null);
         functionAssertions = new FunctionAssertions(session);
     }
 
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestTimestamp.java b/presto-main/src/test/java/com/facebook/presto/type/TestTimestamp.java
index 001bdfd6d4df..ce05b368975c 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestTimestamp.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestTimestamp.java
@@ -29,8 +29,6 @@
 
 import java.util.Locale;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKey;
 import static com.facebook.presto.util.DateTimeZoneIndex.getDateTimeZone;
 
@@ -44,7 +42,7 @@ public class TestTimestamp
     @BeforeClass
     public void setUp()
     {
-        Session session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TIME_ZONE_KEY, Locale.ENGLISH, null, null);
+        Session session = new Session("user", "test", "catalog", "schema", TIME_ZONE_KEY, Locale.ENGLISH, null, null);
         functionAssertions = new FunctionAssertions(session);
     }
 
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestTimestampWithTimeZone.java b/presto-main/src/test/java/com/facebook/presto/type/TestTimestampWithTimeZone.java
index 125896f5b316..b84459b37d14 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestTimestampWithTimeZone.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestTimestampWithTimeZone.java
@@ -29,8 +29,6 @@
 
 import java.util.Locale;
 
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKey;
 import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKeyForOffset;
 import static com.facebook.presto.util.DateTimeZoneIndex.getDateTimeZone;
@@ -48,7 +46,7 @@ public class TestTimestampWithTimeZone
     @BeforeClass
     public void setUp()
     {
-        session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, getTimeZoneKey("+06:09"), Locale.ENGLISH, null, null);
+        session = new Session("user", "test", "catalog", "schema", getTimeZoneKey("+06:09"), Locale.ENGLISH, null, null);
         functionAssertions = new FunctionAssertions(session);
     }
 
diff --git a/presto-server/src/main/java/com/facebook/presto/server/testing/TestingPrestoServer.java b/presto-server/src/main/java/com/facebook/presto/server/testing/TestingPrestoServer.java
index 5f75bf16ce09..2dfde2c5f5f8 100644
--- a/presto-server/src/main/java/com/facebook/presto/server/testing/TestingPrestoServer.java
+++ b/presto-server/src/main/java/com/facebook/presto/server/testing/TestingPrestoServer.java
@@ -56,6 +56,8 @@
 public class TestingPrestoServer
         implements Closeable
 {
+    public static final String TEST_CATALOG = "default"; // TODO: change this to test_catalog
+
     private final Path baseDataDir;
     private final LifeCycleManager lifeCycleManager;
     private final PluginManager pluginManager;
@@ -133,7 +135,7 @@ public TestingPrestoServer(boolean coordinator, Map<String, String> properties,
         pluginManager = injector.getInstance(PluginManager.class);
 
         connectorManager = injector.getInstance(ConnectorManager.class);
-        connectorManager.createConnection("default", "native", ImmutableMap.<String, String>of());
+        connectorManager.createConnection(TEST_CATALOG, "native", ImmutableMap.<String, String>of());
 
         server = injector.getInstance(TestingHttpServer.class);
         metadata = injector.getInstance(Metadata.class);
diff --git a/presto-server/src/test/java/com/facebook/presto/server/TestDistributedQueries.java b/presto-server/src/test/java/com/facebook/presto/server/TestDistributedQueries.java
index bdcfcb2f99b1..3a7e1b425484 100644
--- a/presto-server/src/test/java/com/facebook/presto/server/TestDistributedQueries.java
+++ b/presto-server/src/test/java/com/facebook/presto/server/TestDistributedQueries.java
@@ -61,8 +61,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.facebook.presto.connector.informationSchema.InformationSchemaMetadata.INFORMATION_SCHEMA;
-import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
-import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
+import static com.facebook.presto.server.testing.TestingPrestoServer.TEST_CATALOG;
 import static com.facebook.presto.spi.type.BigintType.BIGINT;
 import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
 import static com.facebook.presto.spi.type.DateTimeEncoding.unpackMillisUtc;
@@ -96,7 +95,7 @@
 public class TestDistributedQueries
         extends AbstractTestSampledQueries
 {
-    private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
+    private static final Session SESSION = new Session("user", "test", TEST_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
 
     private static final String ENVIRONMENT = "testing";
     private static final Logger log = Logger.get(TestDistributedQueries.class.getSimpleName());
@@ -224,7 +223,7 @@ private void assertCreateTable(String table, @Language("SQL") String query, @Lan
             assertQuery("SELECT * FROM " + table, expectedQuery);
         }
         finally {
-            QualifiedTableName name = new QualifiedTableName(DEFAULT_CATALOG, DEFAULT_SCHEMA, table);
+            QualifiedTableName name = new QualifiedTableName(TEST_CATALOG, "test", table);
             Optional<TableHandle> handle = coordinator.getMetadata().getTableHandle(SESSION, name);
             if (handle.isPresent()) {
                 coordinator.getMetadata().dropTable(handle.get());
diff --git a/presto-server/src/test/java/com/facebook/presto/server/TestExecuteResource.java b/presto-server/src/test/java/com/facebook/presto/server/TestExecuteResource.java
index 6a73734e8c55..619ea62cab79 100644
--- a/presto-server/src/test/java/com/facebook/presto/server/TestExecuteResource.java
+++ b/presto-server/src/test/java/com/facebook/presto/server/TestExecuteResource.java
@@ -15,7 +15,6 @@
 
 import com.facebook.presto.client.PrestoHeaders;
 import com.facebook.presto.server.testing.TestingPrestoServer;
-import com.facebook.presto.spi.Session;
 import com.google.common.base.Charsets;
 import com.google.common.net.HttpHeaders;
 import io.airlift.http.client.HttpClient;
@@ -75,8 +74,8 @@ private StringResponse executeQuery(String query)
         Request request = preparePost()
                 .setUri(server.resolve("/v1/execute"))
                 .setHeader(PrestoHeaders.PRESTO_USER, "test")
-                .setHeader(PrestoHeaders.PRESTO_CATALOG, Session.DEFAULT_CATALOG)
-                .setHeader(PrestoHeaders.PRESTO_SCHEMA, Session.DEFAULT_SCHEMA)
+                .setHeader(PrestoHeaders.PRESTO_CATALOG, "catalog")
+                .setHeader(PrestoHeaders.PRESTO_SCHEMA, "schema")
                 .setHeader(PrestoHeaders.PRESTO_TIME_ZONE, "UTC")
                 .setBodyGenerator(createStaticBodyGenerator(query, Charsets.UTF_8))
                 .build();
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/Session.java b/presto-spi/src/main/java/com/facebook/presto/spi/Session.java
index df54c2d65b31..6c7ddf586ab2 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/Session.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/Session.java
@@ -23,9 +23,6 @@
 
 public class Session
 {
-    public static final String DEFAULT_CATALOG = "default";
-    public static final String DEFAULT_SCHEMA = "default";
-
     private final String user;
     private final String source;
     private final TimeZoneKey timeZoneKey;