diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
index cd172478cf..ba38c71bd5 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
@@ -326,7 +326,7 @@ private static MethodDefinition createSetUpMethod(
 
     Expr initLocalSettingsExpr =
         AssignmentExpr.builder()
-            .setVariableExpr(localSettingsVarExpr)
+            .setVariableExpr(localSettingsVarExpr.toBuilder().setIsDecl(true).build())
             .setValueExpr(settingsBuilderExpr)
             .build();
 
@@ -365,7 +365,6 @@ private static MethodDefinition createTearDownMethod(
     return MethodDefinition.builder()
         .setAnnotations(Arrays.asList(AnnotationNode.withType(staticTypes.get("After"))))
         .setScope(ScopeNode.PUBLIC)
-        .setIsStatic(true)
         .setReturnType(TypeNode.VOID)
         .setName("tearDown")
         .setThrowsExceptions(
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
index 090428c836..e916663570 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
@@ -102,7 +102,7 @@ public void generateServiceClasses() {
           + "  public void setUp() throws IOException {\n"
           + "    mockServiceHelper.reset();\n"
           + "    channelProvider = mockServiceHelper.createChannelProvider();\n"
-          + "    settings =\n"
+          + "    EchoSettings settings =\n"
           + "        EchoSettings.newBuilder()\n"
           + "            .setTransportChannelProvider(channelProvider)\n"
           + "            .setCredentialsProvider(NoCredentialsProvider.create())\n"
@@ -111,7 +111,7 @@ public void generateServiceClasses() {
           + "  }\n"
           + "\n"
           + "  @After\n"
-          + "  public static void tearDown() throws Exception {\n"
+          + "  public void tearDown() throws Exception {\n"
           + "    client.close();\n"
           + "  }\n"
           + "}\n";