@@ -103,7 +103,11 @@ public void queryOptions() {
 
 // Create a SpannerOptions with and without default query options.
 SpannerOptions optionsWithQueryOptions =
-new SpannerOptions.Builder(SpannerOptions.getDefaultInstance()) {
+new SpannerOptions.Builder(
+SpannerOptions.newBuilder()
+.setProjectId("some-project")
+.setCredentials(NoCredentials.getInstance())
+.build()) {
 @Override
 QueryOptions getEnvironmentQueryOptions() {
 // Override and return default instance to prevent environment variables from
@@ -112,7 +116,11 @@ QueryOptions getEnvironmentQueryOptions() {
 }
 }.setDefaultQueryOptions(db, queryOptions).build();
 SpannerOptions optionsWithoutQueryOptions =
-new SpannerOptions.Builder(SpannerOptions.getDefaultInstance()) {
+new SpannerOptions.Builder(
+SpannerOptions.newBuilder()
+.setProjectId("some-project")
+.setCredentials(NoCredentials.getInstance())
+.build()) {
 @Override
 QueryOptions getEnvironmentQueryOptions() {
 // Override and return default instance to prevent environment variables from

@@ -389,19 +389,36 @@ public void testDoNotCacheClosedSpannerInstance() {
 public void testSetClientLibToken() {
 final String jdbcToken = "sp-jdbc";
 final String hibernateToken = "sp-hib";
-SpannerOptions options = SpannerOptions.newBuilder().setClientLibToken(jdbcToken).build();
+SpannerOptions options =
+SpannerOptions.newBuilder()
+.setProjectId("some-project")
+.setCredentials(NoCredentials.getInstance())
+.setClientLibToken(jdbcToken)
+.build();
 assertThat(options.getClientLibToken()).isEqualTo(jdbcToken);
 
-options = SpannerOptions.newBuilder().setClientLibToken(hibernateToken).build();
+options =
+SpannerOptions.newBuilder()
+.setProjectId("some-project")
+.setCredentials(NoCredentials.getInstance())
+.setClientLibToken(hibernateToken)
+.build();
 assertThat(options.getClientLibToken()).isEqualTo(hibernateToken);
 
-options = SpannerOptions.newBuilder().build();
+options =
+SpannerOptions.newBuilder()
+.setProjectId("some-project")
+.setCredentials(NoCredentials.getInstance())
+.build();
 assertThat(options.getClientLibToken()).isEqualTo(ServiceOptions.getGoogApiClientLibName());
 }
 
 @Test(expected = IllegalArgumentException.class)
 public void testSetInvalidClientLibToken() {
-SpannerOptions.newBuilder().setClientLibToken("foo");
+SpannerOptions.newBuilder()
+.setProjectId("some-project")
+.setCredentials(NoCredentials.getInstance())
+.setClientLibToken("foo");
 }
 
 @Test
@@ -443,6 +460,8 @@ public String getOptimizerVersion() {
 .setDefaultQueryOptions(
 DatabaseId.of("p", "i", "d"),
 QueryOptions.newBuilder().setOptimizerVersion("1").build())
+.setProjectId("p")
+.setCredentials(NoCredentials.getInstance())
 .build();
 assertThat(options.getDefaultQueryOptions(DatabaseId.of("p", "i", "d")))
 .isEqualTo(QueryOptions.newBuilder().setOptimizerVersion("1").build());
@@ -464,6 +483,8 @@ public String getOptimizerVersion() {
 .setDefaultQueryOptions(
 DatabaseId.of("p", "i", "d"),
 QueryOptions.newBuilder().setOptimizerVersion("1").build())
+.setProjectId("p")
+.setCredentials(NoCredentials.getInstance())
 .build();
 assertThat(options.getDefaultQueryOptions(DatabaseId.of("p", "i", "d")))
 .isEqualTo(QueryOptions.newBuilder().setOptimizerVersion("2").build());

@@ -281,6 +281,7 @@ && getNumberOfThreadsWithName(SPANNER_THREAD_NAME, false)
 public void testCallCredentialsProviderPreferenceAboveCredentials() {
 SpannerOptions options =
 SpannerOptions.newBuilder()
+.setProjectId("some-project")
 .setCredentials(STATIC_CREDENTIALS)
 .setCallCredentialsProvider(
 new CallCredentialsProvider() {
@@ -302,6 +303,7 @@ public CallCredentials getCallCredentials() {
 public void testCallCredentialsProviderReturnsNull() {
 SpannerOptions options =
 SpannerOptions.newBuilder()
+.setProjectId("some-project")
 .setCredentials(STATIC_CREDENTIALS)
 .setCallCredentialsProvider(
 new CallCredentialsProvider() {
@@ -319,7 +321,11 @@ public CallCredentials getCallCredentials() {
 
 @Test
 public void testNoCallCredentials() {
-SpannerOptions options = SpannerOptions.newBuilder().setCredentials(STATIC_CREDENTIALS).build();
+SpannerOptions options =
+SpannerOptions.newBuilder()
+.setProjectId("some-project")
+.setCredentials(STATIC_CREDENTIALS)
+.build();
 GapicSpannerRpc rpc = new GapicSpannerRpc(options);
 assertThat(rpc.newCallContext(optionsMap, "/some/resource").getCallOptions().getCredentials())
 .isNull();